Rename WebKit namespace to blink (part 5)

This CL updates all references to the WebKit namespace outside of content,
chrome, and components.

TBR=darin@chromium.org
BUG=295096

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

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

5 files changed, 49 insertions, 49 deletions

diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index d8c3520..cf65c39 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -30,13 +30,13 @@ AwContentRendererClient::~AwContentRendererClient() {
 }
 
 void AwContentRendererClient::RenderThreadStarted() {
-  WebKit::WebString content_scheme(
+  blink::WebString content_scheme(
       ASCIIToUTF16(android_webview::kContentScheme));
-  WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme);
+  blink::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme);
 
-  WebKit::WebString aw_scheme(
+  blink::WebString aw_scheme(
       ASCIIToUTF16(android_webview::kAndroidWebViewVideoPosterScheme));
-  WebKit::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme);
+  blink::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme);
 
   content::RenderThread* thread = content::RenderThread::Get();
 
@@ -68,9 +68,9 @@ bool AwContentRendererClient::HasErrorPage(int http_status_code,
 }
 
 void AwContentRendererClient::GetNavigationErrorStrings(
-    WebKit::WebFrame* /* frame */,
-    const WebKit::WebURLRequest& failed_request,
-    const WebKit::WebURLError& error,
+    blink::WebFrame* /* frame */,
+    const blink::WebURLRequest& failed_request,
+    const blink::WebURLError& error,
     const std::string& accept_languages,
     std::string* error_html,
     string16* error_description) {
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index c4d0f47..a3660c4 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -28,9 +28,9 @@ class AwContentRendererClient : public content::ContentRendererClient {
   virtual bool HasErrorPage(int http_status_code,
                             std::string* error_domain) OVERRIDE;
   virtual void GetNavigationErrorStrings(
-      WebKit::WebFrame* frame,
-      const WebKit::WebURLRequest& failed_request,
-      const WebKit::WebURLError& error,
+      blink::WebFrame* frame,
+      const blink::WebURLRequest& failed_request,
+      const blink::WebURLError& error,
       const std::string& accept_languages,
       std::string* error_html,
       string16* error_description) OVERRIDE;
diff --git a/android_webview/renderer/aw_render_process_observer.cc b/android_webview/renderer/aw_render_process_observer.cc
index 561580c..ab7d9d3 100644
--- a/android_webview/renderer/aw_render_process_observer.cc
+++ b/android_webview/renderer/aw_render_process_observer.cc
@@ -35,12 +35,12 @@ void AwRenderProcessObserver::WebKitInitialized() {
 
 void AwRenderProcessObserver::OnClearCache() {
   if (webkit_initialized_)
-    WebKit::WebCache::clear();
+    blink::WebCache::clear();
 }
 
 void AwRenderProcessObserver::OnSetJsOnlineProperty(bool network_up) {
   if (webkit_initialized_)
-    WebKit::WebNetworkStateNotifier::setOnLine(network_up);
+    blink::WebNetworkStateNotifier::setOnLine(network_up);
 }
 
 }  // nanemspace android_webview
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc
index 5a110d7..f806115 100644
--- a/android_webview/renderer/aw_render_view_ext.cc
+++ b/android_webview/renderer/aw_render_view_ext.cc
@@ -37,7 +37,7 @@ namespace android_webview {
 
 namespace {
 
-bool AllowMixedContent(const WebKit::WebURL& url) {
+bool AllowMixedContent(const blink::WebURL& url) {
   // We treat non-standard schemes as "secure" in the WebView to allow them to
   // be used for request interception.
   // TODO(benm): Tighten this restriction by requiring embedders to register
@@ -46,30 +46,30 @@ bool AllowMixedContent(const WebKit::WebURL& url) {
   return !gurl.IsStandard();
 }
 
-GURL GetAbsoluteUrl(const WebKit::WebNode& node, const string16& url_fragment) {
+GURL GetAbsoluteUrl(const blink::WebNode& node, const string16& url_fragment) {
   return GURL(node.document().completeURL(url_fragment));
 }
 
-string16 GetHref(const WebKit::WebElement& element) {
+string16 GetHref(const blink::WebElement& element) {
   // Get the actual 'href' attribute, which might relative if valid or can
   // possibly contain garbage otherwise, so not using absoluteLinkURL here.
   return element.getAttribute("href");
 }
 
-GURL GetAbsoluteSrcUrl(const WebKit::WebElement& element) {
+GURL GetAbsoluteSrcUrl(const blink::WebElement& element) {
   if (element.isNull())
     return GURL();
   return GetAbsoluteUrl(element, element.getAttribute("src"));
 }
 
-WebKit::WebNode GetImgChild(const WebKit::WebNode& node) {
+blink::WebNode GetImgChild(const blink::WebNode& node) {
   // This implementation is incomplete (for example if is an area tag) but
   // matches the original WebViewClassic implementation.
 
-  WebKit::WebNodeList list = node.getElementsByTagName("img");
+  blink::WebNodeList list = node.getElementsByTagName("img");
   if (list.length() > 0)
     return list.item(0);
-  return WebKit::WebNode();
+  return blink::WebNode();
 }
 
 bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix,
@@ -175,9 +175,9 @@ bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) {
 void AwRenderViewExt::OnDocumentHasImagesRequest(int id) {
   bool hasImages = false;
   if (render_view()) {
-    WebKit::WebView* webview = render_view()->GetWebView();
+    blink::WebView* webview = render_view()->GetWebView();
     if (webview) {
-      WebKit::WebVector<WebKit::WebElement> images;
+      blink::WebVector<blink::WebElement> images;
       webview->mainFrame()->document().images(images);
       hasImages = !images.isEmpty();
     }
@@ -187,27 +187,27 @@ void AwRenderViewExt::OnDocumentHasImagesRequest(int id) {
 }
 
 bool AwRenderViewExt::allowDisplayingInsecureContent(
-      WebKit::WebFrame* frame,
+      blink::WebFrame* frame,
       bool enabled_per_settings,
-      const WebKit::WebSecurityOrigin& origin,
-      const WebKit::WebURL& url) {
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) {
   return enabled_per_settings ? true : AllowMixedContent(url);
 }
 
 bool AwRenderViewExt::allowRunningInsecureContent(
-      WebKit::WebFrame* frame,
+      blink::WebFrame* frame,
       bool enabled_per_settings,
-      const WebKit::WebSecurityOrigin& origin,
-      const WebKit::WebURL& url) {
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) {
   return enabled_per_settings ? true : AllowMixedContent(url);
 }
 
-void AwRenderViewExt::DidCommitProvisionalLoad(WebKit::WebFrame* frame,
+void AwRenderViewExt::DidCommitProvisionalLoad(blink::WebFrame* frame,
                                                bool is_new_navigation) {
   content::DocumentState* document_state =
       content::DocumentState::FromDataSource(frame->dataSource());
   if (document_state->can_load_local_resources()) {
-    WebKit::WebSecurityOrigin origin = frame->document().securityOrigin();
+    blink::WebSecurityOrigin origin = frame->document().securityOrigin();
     origin.grantLoadLocalResources();
   }
 }
@@ -239,7 +239,7 @@ void AwRenderViewExt::CheckContentsSize() {
 
   gfx::Size contents_size;
 
-  WebKit::WebFrame* main_frame = render_view()->GetWebView()->mainFrame();
+  blink::WebFrame* main_frame = render_view()->GetWebView()->mainFrame();
   if (main_frame)
     contents_size = main_frame->contentsSize();
 
@@ -264,15 +264,15 @@ void AwRenderViewExt::Navigate(const GURL& url) {
   // the browser side (in RenderViewHostManger), to the IPCmessages and to the
   // RenderViewObserver. Thus, clearing decoding image cache on Navigate, seems
   // a more acceptable compromise.
-  WebKit::WebImageCache::clear();
+  blink::WebImageCache::clear();
 }
 
-void AwRenderViewExt::FocusedNodeChanged(const WebKit::WebNode& node) {
+void AwRenderViewExt::FocusedNodeChanged(const blink::WebNode& node) {
   if (node.isNull() || !node.isElementNode() || !render_view())
     return;
 
   // Note: element is not const due to innerText() is not const.
-  WebKit::WebElement element = node.toConst<WebKit::WebElement>();
+  blink::WebElement element = node.toConst<blink::WebElement>();
   AwHitTestData data;
 
   data.href = GetHref(element);
@@ -283,10 +283,10 @@ void AwRenderViewExt::FocusedNodeChanged(const WebKit::WebNode& node) {
     absolute_link_url = GetAbsoluteUrl(node, data.href);
 
   GURL absolute_image_url;
-  const WebKit::WebNode child_img = GetImgChild(node);
+  const blink::WebNode child_img = GetImgChild(node);
   if (!child_img.isNull() && child_img.isElementNode()) {
     absolute_image_url =
-        GetAbsoluteSrcUrl(child_img.toConst<WebKit::WebElement>());
+        GetAbsoluteSrcUrl(child_img.toConst<blink::WebElement>());
   }
 
   PopulateHitTestData(absolute_link_url,
@@ -300,9 +300,9 @@ void AwRenderViewExt::OnDoHitTest(int view_x, int view_y) {
   if (!render_view() || !render_view()->GetWebView())
     return;
 
-  const WebKit::WebHitTestResult result =
+  const blink::WebHitTestResult result =
       render_view()->GetWebView()->hitTestResultAt(
-          WebKit::WebPoint(view_x, view_y));
+          blink::WebPoint(view_x, view_y));
   AwHitTestData data;
 
   if (!result.urlElement().isNull()) {
diff --git a/android_webview/renderer/aw_render_view_ext.h b/android_webview/renderer/aw_render_view_ext.h
index aaa565f..e2f4049 100644
--- a/android_webview/renderer/aw_render_view_ext.h
+++ b/android_webview/renderer/aw_render_view_ext.h
@@ -13,12 +13,12 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/size.h"
 
-namespace WebKit {
+namespace blink {
 
 class WebNode;
 class WebURL;
 
-}  // namespace WebKit
+}  // namespace blink
 
 namespace android_webview {
 
@@ -26,7 +26,7 @@ namespace android_webview {
 // implementation of miscellaneous WebView functions that we need to poke
 // WebKit directly to implement (and that aren't needed in the chrome app).
 class AwRenderViewExt : public content::RenderViewObserver,
-                        public WebKit::WebPermissionClient {
+                        public blink::WebPermissionClient {
  public:
   static void RenderViewCreated(content::RenderView* render_view);
 
@@ -36,9 +36,9 @@ class AwRenderViewExt : public content::RenderViewObserver,
 
   // RenderView::Observer:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
+  virtual void DidCommitProvisionalLoad(blink::WebFrame* frame,
                                         bool is_new_navigation) OVERRIDE;
-  virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE;
+  virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE;
   virtual void DidCommitCompositorFrame() OVERRIDE;
   virtual void DidUpdateLayout() OVERRIDE;
   virtual void Navigate(const GURL& url) OVERRIDE;
@@ -61,17 +61,17 @@ class AwRenderViewExt : public content::RenderViewObserver,
 
   void CheckContentsSize();
 
-  // WebKit::WebPermissionClient implementation.
+  // blink::WebPermissionClient implementation.
   virtual bool allowDisplayingInsecureContent(
-      WebKit::WebFrame* frame,
+      blink::WebFrame* frame,
       bool enabled_per_settings,
-      const WebKit::WebSecurityOrigin& origin,
-      const WebKit::WebURL& url) OVERRIDE;
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) OVERRIDE;
   virtual bool allowRunningInsecureContent(
-      WebKit::WebFrame* frame,
+      blink::WebFrame* frame,
       bool enabled_per_settings,
-      const WebKit::WebSecurityOrigin& origin,
-      const WebKit::WebURL& url) OVERRIDE;
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) OVERRIDE;
 
   bool capture_picture_enabled_;