Rename WebKit namespace to blink (part 3)

This CL updates all references to the WebKit namespace in content.

TBR=darin@chromium.org
BUG=295096

Review URL: https://codereview.chromium.org/63253002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233513 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 129 insertions, 129 deletions

diff --git a/content/worker/shared_worker_devtools_agent.cc b/content/worker/shared_worker_devtools_agent.cc
index 9de9643..733dae1 100644
--- a/content/worker/shared_worker_devtools_agent.cc
+++ b/content/worker/shared_worker_devtools_agent.cc
@@ -10,8 +10,8 @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebSharedWorker.h"
 
-using WebKit::WebSharedWorker;
-using WebKit::WebString;
+using blink::WebSharedWorker;
+using blink::WebString;
 
 namespace content {
 
@@ -44,14 +44,14 @@ bool SharedWorkerDevToolsAgent::OnMessageReceived(const IPC::Message& message) {
 }
 
 void SharedWorkerDevToolsAgent::SendDevToolsMessage(
-    const WebKit::WebString& message) {
+    const blink::WebString& message) {
     Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(
         route_id_,
         message.utf8()));
 }
 
 void SharedWorkerDevToolsAgent::SaveDevToolsAgentState(
-    const WebKit::WebString& state) {
+    const blink::WebString& state) {
   Send(new DevToolsHostMsg_SaveAgentRuntimeState(route_id_,
                                                  state.utf8()));
 }
diff --git a/content/worker/shared_worker_devtools_agent.h b/content/worker/shared_worker_devtools_agent.h
index ad6bc7d..bfe0fef 100644
--- a/content/worker/shared_worker_devtools_agent.h
+++ b/content/worker/shared_worker_devtools_agent.h
@@ -13,7 +13,7 @@ namespace IPC {
 class Message;
 }
 
-namespace WebKit {
+namespace blink {
 class WebSharedWorker;
 class WebString;
 }
@@ -22,13 +22,13 @@ namespace content {
 
 class SharedWorkerDevToolsAgent {
  public:
-  SharedWorkerDevToolsAgent(int route_id, WebKit::WebSharedWorker*);
+  SharedWorkerDevToolsAgent(int route_id, blink::WebSharedWorker*);
   ~SharedWorkerDevToolsAgent();
 
   // Called on the Worker thread.
   bool OnMessageReceived(const IPC::Message& message);
-  void SendDevToolsMessage(const WebKit::WebString&);
-  void SaveDevToolsAgentState(const WebKit::WebString& state);
+  void SendDevToolsMessage(const blink::WebString&);
+  void SaveDevToolsAgentState(const blink::WebString& state);
 
  private:
   void OnAttach();
@@ -40,7 +40,7 @@ class SharedWorkerDevToolsAgent {
 
   bool Send(IPC::Message* message);
   const int route_id_;
-  WebKit::WebSharedWorker* webworker_;
+  blink::WebSharedWorker* webworker_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedWorkerDevToolsAgent);
 };
diff --git a/content/worker/shared_worker_permission_client_proxy.cc b/content/worker/shared_worker_permission_client_proxy.cc
index eb5c1d5..eb187c2 100644
--- a/content/worker/shared_worker_permission_client_proxy.cc
+++ b/content/worker/shared_worker_permission_client_proxy.cc
@@ -26,8 +26,8 @@ SharedWorkerPermissionClientProxy::~SharedWorkerPermissionClientProxy() {
 }
 
 bool SharedWorkerPermissionClientProxy::allowDatabase(
-    const WebKit::WebString& name,
-    const WebKit::WebString& display_name,
+    const blink::WebString& name,
+    const blink::WebString& display_name,
     unsigned long estimated_size) {
   if (is_unique_origin_)
     return false;
@@ -48,7 +48,7 @@ bool SharedWorkerPermissionClientProxy::allowFileSystem() {
 }
 
 bool SharedWorkerPermissionClientProxy::allowIndexedDB(
-    const WebKit::WebString& name) {
+    const blink::WebString& name) {
   if (is_unique_origin_)
     return false;
   bool result = false;
diff --git a/content/worker/shared_worker_permission_client_proxy.h b/content/worker/shared_worker_permission_client_proxy.h
index bc742cd..61f58c9 100644
--- a/content/worker/shared_worker_permission_client_proxy.h
+++ b/content/worker/shared_worker_permission_client_proxy.h
@@ -17,7 +17,7 @@ class ThreadSafeSender;
 // This proxy is created on the main renderer thread then passed onto
 // the blink's worker thread.
 class SharedWorkerPermissionClientProxy
-    : public WebKit::WebWorkerPermissionClientProxy {
+    : public blink::WebWorkerPermissionClientProxy {
  public:
   SharedWorkerPermissionClientProxy(
       const GURL& origin_url,
@@ -27,11 +27,11 @@ class SharedWorkerPermissionClientProxy
   virtual ~SharedWorkerPermissionClientProxy();
 
   // WebWorkerPermissionClientProxy overrides.
-  virtual bool allowDatabase(const WebKit::WebString& name,
-                             const WebKit::WebString& display_name,
+  virtual bool allowDatabase(const blink::WebString& name,
+                             const blink::WebString& display_name,
                              unsigned long estimated_size);
   virtual bool allowFileSystem();
-  virtual bool allowIndexedDB(const WebKit::WebString& name);
+  virtual bool allowIndexedDB(const blink::WebString& name);
 
  private:
   const GURL origin_url_;
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc
index 745b63c..ed65dc2 100644
--- a/content/worker/websharedworker_stub.cc
+++ b/content/worker/websharedworker_stub.cc
@@ -36,7 +36,7 @@ WebSharedWorkerStub::WebSharedWorkerStub(
   ChildProcess::current()->AddRefProcess();
 
   // TODO(atwilson): Add support for NaCl when they support MessagePorts.
-  impl_ = WebKit::WebSharedWorker::create(client());
+  impl_ = blink::WebSharedWorker::create(client());
   worker_devtools_agent_.reset(new SharedWorkerDevToolsAgent(route_id, impl_));
   client()->set_devtools_agent(worker_devtools_agent_.get());
 }
@@ -85,7 +85,7 @@ const GURL& WebSharedWorkerStub::url() {
 void WebSharedWorkerStub::OnStartWorkerContext(
     const GURL& url, const string16& user_agent, const string16& source_code,
     const string16& content_security_policy,
-    WebKit::WebContentSecurityPolicyType policy_type) {
+    blink::WebContentSecurityPolicyType policy_type) {
   // Ignore multiple attempts to start this worker (can happen if two pages
   // try to start it simultaneously).
   if (started_)
@@ -107,7 +107,7 @@ void WebSharedWorkerStub::OnStartWorkerContext(
 
 void WebSharedWorkerStub::OnConnect(int sent_message_port_id, int routing_id) {
   if (started_) {
-    WebKit::WebMessagePortChannel* channel =
+    blink::WebMessagePortChannel* channel =
         new WebMessagePortChannelImpl(routing_id,
                                       sent_message_port_id,
                                       base::MessageLoopProxy::current().get());
diff --git a/content/worker/websharedworker_stub.h b/content/worker/websharedworker_stub.h
index 8dd312d..012decd 100644
--- a/content/worker/websharedworker_stub.h
+++ b/content/worker/websharedworker_stub.h
@@ -12,7 +12,7 @@
 #include "third_party/WebKit/public/web/WebSharedWorker.h"
 #include "url/gurl.h"
 
-namespace WebKit {
+namespace blink {
 class WebSharedWorker;
 }
 
@@ -55,7 +55,7 @@ class WebSharedWorkerStub : public IPC::Listener {
   void OnStartWorkerContext(
       const GURL& url, const string16& user_agent, const string16& source_code,
       const string16& content_security_policy,
-      WebKit::WebContentSecurityPolicyType policy_type);
+      blink::WebContentSecurityPolicyType policy_type);
 
   void OnTerminateWorkerContext();
 
@@ -66,7 +66,7 @@ class WebSharedWorkerStub : public IPC::Listener {
   // from the worker object.
   WebSharedWorkerClientProxy client_;
 
-  WebKit::WebSharedWorker* impl_;
+  blink::WebSharedWorker* impl_;
   string16 name_;
   bool started_;
   GURL url_;
diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc
index 769b201..1e8c92f 100644
--- a/content/worker/websharedworkerclient_proxy.cc
+++ b/content/worker/websharedworkerclient_proxy.cc
@@ -22,14 +22,14 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 
-using WebKit::WebApplicationCacheHost;
-using WebKit::WebFrame;
-using WebKit::WebMessagePortChannel;
-using WebKit::WebMessagePortChannelArray;
-using WebKit::WebSecurityOrigin;
-using WebKit::WebString;
-using WebKit::WebWorker;
-using WebKit::WebSharedWorkerClient;
+using blink::WebApplicationCacheHost;
+using blink::WebFrame;
+using blink::WebMessagePortChannel;
+using blink::WebMessagePortChannelArray;
+using blink::WebSecurityOrigin;
+using blink::WebString;
+using blink::WebWorker;
+using blink::WebSharedWorkerClient;
 
 namespace content {
 
@@ -59,7 +59,7 @@ void WebSharedWorkerClientProxy::workerContextDestroyed() {
     stub_->Shutdown();
 }
 
-WebKit::WebNotificationPresenter*
+blink::WebNotificationPresenter*
 WebSharedWorkerClientProxy::notificationPresenter() {
   // TODO(johnnyg): Notifications are not yet hooked up to workers.
   // Coming soon.
@@ -68,7 +68,7 @@ WebSharedWorkerClientProxy::notificationPresenter() {
 }
 
 WebApplicationCacheHost* WebSharedWorkerClientProxy::createApplicationCacheHost(
-    WebKit::WebApplicationCacheHostClient* client) {
+    blink::WebApplicationCacheHostClient* client) {
   WorkerWebApplicationCacheHostImpl* host =
       new WorkerWebApplicationCacheHostImpl(stub_->appcache_init_info(),
                                             client);
@@ -78,9 +78,9 @@ WebApplicationCacheHost* WebSharedWorkerClientProxy::createApplicationCacheHost(
   return host;
 }
 
-WebKit::WebWorkerPermissionClientProxy*
+blink::WebWorkerPermissionClientProxy*
 WebSharedWorkerClientProxy::createWorkerPermissionClientProxy(
-    const WebKit::WebSecurityOrigin& origin) {
+    const blink::WebSecurityOrigin& origin) {
   return new SharedWorkerPermissionClientProxy(
       GURL(origin.toString()), origin.isUnique(), route_id_,
       ChildThread::current()->thread_safe_sender());
@@ -98,7 +98,7 @@ bool WebSharedWorkerClientProxy::allowFileSystem() {
   return false;
 }
 
-bool WebSharedWorkerClientProxy::allowIndexedDB(const WebKit::WebString& name) {
+bool WebSharedWorkerClientProxy::allowIndexedDB(const blink::WebString& name) {
   return false;
 }
 
@@ -109,7 +109,7 @@ void WebSharedWorkerClientProxy::dispatchDevToolsMessage(
 }
 
 void WebSharedWorkerClientProxy::saveDevToolsAgentState(
-    const WebKit::WebString& state) {
+    const blink::WebString& state) {
   if (devtools_agent_)
     devtools_agent_->SaveDevToolsAgentState(state);
 }
diff --git a/content/worker/websharedworkerclient_proxy.h b/content/worker/websharedworkerclient_proxy.h
index bb51323..636e73f 100644
--- a/content/worker/websharedworkerclient_proxy.h
+++ b/content/worker/websharedworkerclient_proxy.h
@@ -10,7 +10,7 @@
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/public/web/WebSharedWorkerClient.h"
 
-namespace WebKit {
+namespace blink {
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebFrame;
@@ -27,7 +27,7 @@ class WebSharedWorkerStub;
 // is also called by the worker code and converts these function calls into
 // IPCs that are sent to the renderer, where they're converted back to function
 // calls by WebWorkerProxy.
-class WebSharedWorkerClientProxy : public WebKit::WebSharedWorkerClient {
+class WebSharedWorkerClientProxy : public blink::WebSharedWorkerClient {
  public:
   WebSharedWorkerClientProxy(int route_id, WebSharedWorkerStub* stub);
   virtual ~WebSharedWorkerClientProxy();
@@ -36,24 +36,24 @@ class WebSharedWorkerClientProxy : public WebKit::WebSharedWorkerClient {
   virtual void workerContextClosed();
   virtual void workerContextDestroyed();
 
-  virtual WebKit::WebNotificationPresenter* notificationPresenter();
+  virtual blink::WebNotificationPresenter* notificationPresenter();
 
-  virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(
-      WebKit::WebApplicationCacheHostClient* client);
-  virtual WebKit::WebWorkerPermissionClientProxy*
+  virtual blink::WebApplicationCacheHost* createApplicationCacheHost(
+      blink::WebApplicationCacheHostClient* client);
+  virtual blink::WebWorkerPermissionClientProxy*
       createWorkerPermissionClientProxy(
-          const WebKit::WebSecurityOrigin& origin);
+          const blink::WebSecurityOrigin& origin);
 
   // TODO(kinuko): Deprecate these methods.
-  virtual bool allowDatabase(WebKit::WebFrame* frame,
-                             const WebKit::WebString& name,
-                             const WebKit::WebString& display_name,
+  virtual bool allowDatabase(blink::WebFrame* frame,
+                             const blink::WebString& name,
+                             const blink::WebString& display_name,
                              unsigned long estimated_size);
   virtual bool allowFileSystem();
-  virtual bool allowIndexedDB(const WebKit::WebString&);
+  virtual bool allowIndexedDB(const blink::WebString&);
 
-  virtual void dispatchDevToolsMessage(const WebKit::WebString&);
-  virtual void saveDevToolsAgentState(const WebKit::WebString&);
+  virtual void dispatchDevToolsMessage(const blink::WebString&);
+  virtual void saveDevToolsAgentState(const blink::WebString&);
 
   void EnsureWorkerContextTerminates();
 
diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc
index de67978..53b483a 100644
--- a/content/worker/worker_thread.cc
+++ b/content/worker/worker_thread.cc
@@ -25,7 +25,7 @@
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "webkit/glue/webkit_glue.h"
 
-using WebKit::WebRuntimeFeatures;
+using blink::WebRuntimeFeatures;
 
 namespace content {
 
@@ -38,14 +38,14 @@ WorkerThread::WorkerThread() {
       thread_safe_sender(),
       sync_message_filter(),
       quota_message_filter()));
-  WebKit::initialize(webkit_platform_support_.get());
+  blink::initialize(webkit_platform_support_.get());
 
   appcache_dispatcher_.reset(
       new AppCacheDispatcher(this, new AppCacheFrontendImpl()));
 
   web_database_observer_impl_.reset(
       new WebDatabaseObserverImpl(sync_message_filter()));
-  WebKit::WebDatabase::setObserver(web_database_observer_impl_.get());
+  blink::WebDatabase::setObserver(web_database_observer_impl_.get());
   db_message_filter_ = new DBMessageFilter();
   channel()->AddFilter(db_message_filter_.get());
 
@@ -77,7 +77,7 @@ void WorkerThread::Shutdown() {
   channel()->RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
 
-  WebKit::shutdown();
+  blink::shutdown();
   lazy_tls.Pointer()->Set(NULL);
 }
 
diff --git a/content/worker/worker_webapplicationcachehost_impl.cc b/content/worker/worker_webapplicationcachehost_impl.cc
index 9283906..23201c8 100644
--- a/content/worker/worker_webapplicationcachehost_impl.cc
+++ b/content/worker/worker_webapplicationcachehost_impl.cc
@@ -11,7 +11,7 @@ namespace content {
 
 WorkerWebApplicationCacheHostImpl::WorkerWebApplicationCacheHostImpl(
     const WorkerAppCacheInitInfo& init_info,
-    WebKit::WebApplicationCacheHostClient* client)
+    blink::WebApplicationCacheHostClient* client)
     : WebApplicationCacheHostImpl(client,
           WorkerThread::current()->appcache_dispatcher()->backend_proxy()) {
   backend()->SelectCacheForSharedWorker(host_id(),
@@ -19,11 +19,11 @@ WorkerWebApplicationCacheHostImpl::WorkerWebApplicationCacheHostImpl(
 }
 
 void WorkerWebApplicationCacheHostImpl::willStartMainResourceRequest(
-    WebKit::WebURLRequest&, const WebKit::WebFrame*) {
+    blink::WebURLRequest&, const blink::WebFrame*) {
 }
 
 void WorkerWebApplicationCacheHostImpl::didReceiveResponseForMainResource(
-    const WebKit::WebURLResponse&) {
+    const blink::WebURLResponse&) {
 }
 
 void WorkerWebApplicationCacheHostImpl::didReceiveDataForMainResource(
@@ -38,7 +38,7 @@ void WorkerWebApplicationCacheHostImpl::selectCacheWithoutManifest() {
 }
 
 bool WorkerWebApplicationCacheHostImpl::selectCacheWithManifest(
-    const WebKit::WebURL&) {
+    const blink::WebURL&) {
   return true;
 }
 
diff --git a/content/worker/worker_webapplicationcachehost_impl.h b/content/worker/worker_webapplicationcachehost_impl.h
index 2360cb3..6f8385c 100644
--- a/content/worker/worker_webapplicationcachehost_impl.h
+++ b/content/worker/worker_webapplicationcachehost_impl.h
@@ -30,15 +30,15 @@ class WorkerWebApplicationCacheHostImpl : public WebApplicationCacheHostImpl {
  public:
   WorkerWebApplicationCacheHostImpl(
       const WorkerAppCacheInitInfo& init_info,
-      WebKit::WebApplicationCacheHostClient* client);
+      blink::WebApplicationCacheHostClient* client);
 
   // Main resource loading is different for workers. The resource is
   // loaded by the creator of the worker rather than the worker itself.
   // These overrides are stubbed out.
   virtual void willStartMainResourceRequest(
-      WebKit::WebURLRequest&, const WebKit::WebFrame*);
+      blink::WebURLRequest&, const blink::WebFrame*);
   virtual void didReceiveResponseForMainResource(
-      const WebKit::WebURLResponse&);
+      const blink::WebURLResponse&);
   virtual void didReceiveDataForMainResource(const char* data, int len);
   virtual void didFinishLoadingMainResource(bool success);
 
@@ -46,7 +46,7 @@ class WorkerWebApplicationCacheHostImpl : public WebApplicationCacheHostImpl {
   // time what cache to select and do so then.
   // These overrides are stubbed out.
   virtual void selectCacheWithoutManifest();
-  virtual bool selectCacheWithManifest(const WebKit::WebURL& manifestURL);
+  virtual bool selectCacheWithManifest(const blink::WebURL& manifestURL);
 };
 
 }  // namespace content
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index f3dee36..7176a77 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -30,18 +30,18 @@
 #include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/glue/webkit_glue.h"
 
-using WebKit::Platform;
-using WebKit::WebBlobRegistry;
-using WebKit::WebClipboard;
-using WebKit::WebFileInfo;
-using WebKit::WebFileSystem;
-using WebKit::WebFileUtilities;
-using WebKit::WebMessagePortChannel;
-using WebKit::WebMimeRegistry;
-using WebKit::WebSandboxSupport;
-using WebKit::WebStorageNamespace;
-using WebKit::WebString;
-using WebKit::WebURL;
+using blink::Platform;
+using blink::WebBlobRegistry;
+using blink::WebClipboard;
+using blink::WebFileInfo;
+using blink::WebFileSystem;
+using blink::WebFileUtilities;
+using blink::WebMessagePortChannel;
+using blink::WebMimeRegistry;
+using blink::WebSandboxSupport;
+using blink::WebStorageNamespace;
+using blink::WebString;
+using blink::WebURL;
 
 namespace content {
 
@@ -169,7 +169,7 @@ WorkerWebKitPlatformSupportImpl::createLocalStorageNamespace() {
 void WorkerWebKitPlatformSupportImpl::dispatchStorageEvent(
     const WebString& key, const WebString& old_value,
     const WebString& new_value, const WebString& origin,
-    const WebKit::WebURL& url, bool is_local_storage) {
+    const blink::WebURL& url, bool is_local_storage) {
   NOTREACHED();
 }
 
@@ -204,7 +204,7 @@ long long WorkerWebKitPlatformSupportImpl::databaseGetSpaceAvailableForOrigin(
                                                  sync_message_filter_.get());
 }
 
-WebKit::WebIDBFactory* WorkerWebKitPlatformSupportImpl::idbFactory() {
+blink::WebIDBFactory* WorkerWebKitPlatformSupportImpl::idbFactory() {
   if (!web_idb_factory_)
     web_idb_factory_.reset(
         new RendererWebIDBFactoryImpl(thread_safe_sender_.get()));
@@ -238,7 +238,7 @@ WorkerWebKitPlatformSupportImpl::supportsMediaMIMEType(
 }
 
 bool WorkerWebKitPlatformSupportImpl::supportsMediaSourceMIMEType(
-    const WebKit::WebString& mimeType, const WebKit::WebString& codecs) {
+    const blink::WebString& mimeType, const blink::WebString& codecs) {
   NOTREACHED();
   return false;
 }
@@ -281,9 +281,9 @@ WebBlobRegistry* WorkerWebKitPlatformSupportImpl::blobRegistry() {
 }
 
 void WorkerWebKitPlatformSupportImpl::queryStorageUsageAndQuota(
-    const WebKit::WebURL& storage_partition,
-    WebKit::WebStorageQuotaType type,
-    WebKit::WebStorageQuotaCallbacks* callbacks) {
+    const blink::WebURL& storage_partition,
+    blink::WebStorageQuotaType type,
+    blink::WebStorageQuotaCallbacks* callbacks) {
   if (!thread_safe_sender_.get() || !quota_message_filter_.get())
     return;
   QuotaDispatcher::ThreadSpecificInstance(
diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h
index 6b78a63..5e83b5d 100644
--- a/content/worker/worker_webkitplatformsupport_impl.h
+++ b/content/worker/worker_webkitplatformsupport_impl.h
@@ -18,7 +18,7 @@ namespace IPC {
 class SyncMessageFilter;
 }
 
-namespace WebKit {
+namespace blink {
 class WebFileUtilities;
 }
 
@@ -28,7 +28,7 @@ class ThreadSafeSender;
 class WebFileSystemImpl;
 
 class WorkerWebKitPlatformSupportImpl : public WebKitPlatformSupportImpl,
-                                        public WebKit::WebMimeRegistry {
+                                        public blink::WebMimeRegistry {
  public:
   WorkerWebKitPlatformSupportImpl(
       ThreadSafeSender* sender,
@@ -37,76 +37,76 @@ class WorkerWebKitPlatformSupportImpl : public WebKitPlatformSupportImpl,
   virtual ~WorkerWebKitPlatformSupportImpl();
 
   // WebKitPlatformSupport methods:
-  virtual WebKit::WebClipboard* clipboard();
-  virtual WebKit::WebMimeRegistry* mimeRegistry();
-  virtual WebKit::WebFileSystem* fileSystem();
-  virtual WebKit::WebFileUtilities* fileUtilities();
-  virtual WebKit::WebSandboxSupport* sandboxSupport();
+  virtual blink::WebClipboard* clipboard();
+  virtual blink::WebMimeRegistry* mimeRegistry();
+  virtual blink::WebFileSystem* fileSystem();
+  virtual blink::WebFileUtilities* fileUtilities();
+  virtual blink::WebSandboxSupport* sandboxSupport();
   virtual bool sandboxEnabled();
   virtual unsigned long long visitedLinkHash(const char* canonicalURL,
                                              size_t length);
   virtual bool isLinkVisited(unsigned long long linkHash);
-  virtual WebKit::WebMessagePortChannel* createMessagePortChannel();
-  virtual void setCookies(const WebKit::WebURL& url,
-                          const WebKit::WebURL& first_party_for_cookies,
-                          const WebKit::WebString& value);
-  virtual WebKit::WebString cookies(
-      const WebKit::WebURL& url,
-      const WebKit::WebURL& first_party_for_cookies);
-  virtual WebKit::WebString defaultLocale();
-  virtual WebKit::WebStorageNamespace* createLocalStorageNamespace();
+  virtual blink::WebMessagePortChannel* createMessagePortChannel();
+  virtual void setCookies(const blink::WebURL& url,
+                          const blink::WebURL& first_party_for_cookies,
+                          const blink::WebString& value);
+  virtual blink::WebString cookies(
+      const blink::WebURL& url,
+      const blink::WebURL& first_party_for_cookies);
+  virtual blink::WebString defaultLocale();
+  virtual blink::WebStorageNamespace* createLocalStorageNamespace();
   virtual void dispatchStorageEvent(
-      const WebKit::WebString& key, const WebKit::WebString& old_value,
-      const WebKit::WebString& new_value, const WebKit::WebString& origin,
-      const WebKit::WebURL& url, bool is_local_storage);
+      const blink::WebString& key, const blink::WebString& old_value,
+      const blink::WebString& new_value, const blink::WebString& origin,
+      const blink::WebURL& url, bool is_local_storage);
 
-  virtual WebKit::Platform::FileHandle databaseOpenFile(
-      const WebKit::WebString& vfs_file_name, int desired_flags);
-  virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name,
+  virtual blink::Platform::FileHandle databaseOpenFile(
+      const blink::WebString& vfs_file_name, int desired_flags);
+  virtual int databaseDeleteFile(const blink::WebString& vfs_file_name,
                                  bool sync_dir);
   virtual long databaseGetFileAttributes(
-      const WebKit::WebString& vfs_file_name);
+      const blink::WebString& vfs_file_name);
   virtual long long databaseGetFileSize(
-      const WebKit::WebString& vfs_file_name);
+      const blink::WebString& vfs_file_name);
   virtual long long databaseGetSpaceAvailableForOrigin(
-      const WebKit::WebString& origin_identifier);
+      const blink::WebString& origin_identifier);
 
-  virtual WebKit::WebBlobRegistry* blobRegistry();
+  virtual blink::WebBlobRegistry* blobRegistry();
 
-  virtual WebKit::WebIDBFactory* idbFactory();
+  virtual blink::WebIDBFactory* idbFactory();
 
   // WebMimeRegistry methods:
-  virtual WebKit::WebMimeRegistry::SupportsType supportsMIMEType(
-      const WebKit::WebString&);
-  virtual WebKit::WebMimeRegistry::SupportsType supportsImageMIMEType(
-      const WebKit::WebString&);
-  virtual WebKit::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
-      const WebKit::WebString&);
-  virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
-      const WebKit::WebString&,
-      const WebKit::WebString&,
-      const WebKit::WebString&);
+  virtual blink::WebMimeRegistry::SupportsType supportsMIMEType(
+      const blink::WebString&);
+  virtual blink::WebMimeRegistry::SupportsType supportsImageMIMEType(
+      const blink::WebString&);
+  virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
+      const blink::WebString&);
+  virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
+      const blink::WebString&,
+      const blink::WebString&,
+      const blink::WebString&);
   virtual bool supportsMediaSourceMIMEType(
-      const WebKit::WebString&,
-      const WebKit::WebString&);
-  virtual WebKit::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
-      const WebKit::WebString&);
-  virtual WebKit::WebString mimeTypeForExtension(const WebKit::WebString&);
-  virtual WebKit::WebString wellKnownMimeTypeForExtension(
-      const WebKit::WebString&);
-  virtual WebKit::WebString mimeTypeFromFile(const WebKit::WebString&);
+      const blink::WebString&,
+      const blink::WebString&);
+  virtual blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
+      const blink::WebString&);
+  virtual blink::WebString mimeTypeForExtension(const blink::WebString&);
+  virtual blink::WebString wellKnownMimeTypeForExtension(
+      const blink::WebString&);
+  virtual blink::WebString mimeTypeFromFile(const blink::WebString&);
   virtual void queryStorageUsageAndQuota(
-      const WebKit::WebURL& storage_partition,
-      WebKit::WebStorageQuotaType,
-      WebKit::WebStorageQuotaCallbacks*) OVERRIDE;
+      const blink::WebURL& storage_partition,
+      blink::WebStorageQuotaType,
+      blink::WebStorageQuotaCallbacks*) OVERRIDE;
 
  private:
 
   class FileUtilities;
   scoped_ptr<FileUtilities> file_utilities_;
-  scoped_ptr<WebKit::WebBlobRegistry> blob_registry_;
+  scoped_ptr<blink::WebBlobRegistry> blob_registry_;
   scoped_ptr<WebFileSystemImpl> web_file_system_;
-  scoped_ptr<WebKit::WebIDBFactory> web_idb_factory_;
+  scoped_ptr<blink::WebIDBFactory> web_idb_factory_;
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<base::MessageLoopProxy> child_thread_loop_;
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;