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

45 files changed, 284 insertions, 284 deletions

diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h
index fa63335..053a454 100644
--- a/content/public/browser/android/compositor.h
+++ b/content/public/browser/android/compositor.h
@@ -76,27 +76,27 @@ class CONTENT_EXPORT Compositor {
 
   // Generates an OpenGL texture and returns a texture handle.  May return 0
   // if the current context is lost.
-  virtual WebKit::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) = 0;
+  virtual blink::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) = 0;
 
   // Generates an OpenGL compressed texture and returns a texture handle.  May
   // return 0 if the current context is lost.
-  virtual WebKit::WebGLId GenerateCompressedTexture(gfx::Size& size,
+  virtual blink::WebGLId GenerateCompressedTexture(gfx::Size& size,
                                                     int data_size,
                                                     void* data) = 0;
 
   // Deletes an OpenGL texture.
-  virtual void DeleteTexture(WebKit::WebGLId texture_id) = 0;
+  virtual void DeleteTexture(blink::WebGLId texture_id) = 0;
 
   // Grabs a copy of |texture_id| and saves it into |bitmap|.  No scaling is
   // done.  It is assumed that the texture size matches that of the bitmap.
-  virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id,
+  virtual bool CopyTextureToBitmap(blink::WebGLId texture_id,
                                    gfx::JavaBitmap& bitmap) = 0;
 
   // Grabs a copy of |texture_id| and saves it into |bitmap|.  No scaling is
   // done. |src_rect| allows the caller to specify which rect of |texture_id|
   // to copy to |bitmap|.  It needs to match the size of |bitmap|.  Returns
   // true if the |texture_id| was copied into |bitmap|, false if not.
-  virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id,
+  virtual bool CopyTextureToBitmap(blink::WebGLId texture_id,
                                    const gfx::Rect& src_rect,
                                    gfx::JavaBitmap& bitmap) = 0;
  protected:
diff --git a/content/public/browser/android/content_view_layer_renderer.h b/content/public/browser/android/content_view_layer_renderer.h
index abc39cc..a7d563a 100644
--- a/content/public/browser/android/content_view_layer_renderer.h
+++ b/content/public/browser/android/content_view_layer_renderer.h
@@ -8,7 +8,7 @@
 // This interface is used by consumers of the ContentViewRenderView to
 // attach/detach layers.
 
-namespace WebKit {
+namespace blink {
 class WebLayer;
 }
 
@@ -16,8 +16,8 @@ namespace content {
 
 class ContentViewLayerRenderer {
  public:
-  virtual void AttachLayer(WebKit::WebLayer* layer) = 0;
-  virtual void DetachLayer(WebKit::WebLayer* layer) = 0;
+  virtual void AttachLayer(blink::WebLayer* layer) = 0;
+  virtual void DetachLayer(blink::WebLayer* layer) = 0;
 
  protected:
   virtual ~ContentViewLayerRenderer() {}
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 0a91186..136a012 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -203,12 +203,12 @@ MediaObserver* ContentBrowserClient::GetMediaObserver() {
   return NULL;
 }
 
-WebKit::WebNotificationPresenter::Permission
+blink::WebNotificationPresenter::Permission
     ContentBrowserClient::CheckDesktopNotificationPermission(
         const GURL& source_origin,
         ResourceContext* context,
         int render_process_id) {
-  return WebKit::WebNotificationPresenter::PermissionAllowed;
+  return blink::WebNotificationPresenter::PermissionAllowed;
 }
 
 bool ContentBrowserClient::CanCreateWindow(
@@ -219,7 +219,7 @@ bool ContentBrowserClient::CanCreateWindow(
     const GURL& target_url,
     const content::Referrer& referrer,
     WindowOpenDisposition disposition,
-    const WebKit::WebWindowFeatures& features,
+    const blink::WebWindowFeatures& features,
     bool user_gesture,
     bool opener_suppressed,
     content::ResourceContext* context,
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 87079c1..e862ca9 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -35,7 +35,7 @@ class CommandLine;
 class GURL;
 struct WebPreferences;
 
-namespace WebKit {
+namespace blink {
 struct WebWindowFeatures;
 }
 
@@ -430,7 +430,7 @@ class CONTENT_EXPORT ContentBrowserClient {
 
   // Checks if the given page has permission to show desktop notifications.
   // This is called on the IO thread.
-  virtual WebKit::WebNotificationPresenter::Permission
+  virtual blink::WebNotificationPresenter::Permission
       CheckDesktopNotificationPermission(
           const GURL& source_url,
           ResourceContext* context,
@@ -461,7 +461,7 @@ class CONTENT_EXPORT ContentBrowserClient {
                                const GURL& target_url,
                                const content::Referrer& referrer,
                                WindowOpenDisposition disposition,
-                               const WebKit::WebWindowFeatures& features,
+                               const blink::WebWindowFeatures& features,
                                bool user_gesture,
                                bool opener_suppressed,
                                content::ResourceContext* context,
diff --git a/content/public/browser/native_web_keyboard_event.h b/content/public/browser/native_web_keyboard_event.h
index 6942222..1585fbd 100644
--- a/content/public/browser/native_web_keyboard_event.h
+++ b/content/public/browser/native_web_keyboard_event.h
@@ -18,7 +18,7 @@ namespace content {
 // Owns a platform specific event; used to pass own and pass event through
 // platform independent code.
 struct CONTENT_EXPORT NativeWebKeyboardEvent :
-  NON_EXPORTED_BASE(public WebKit::WebKeyboardEvent) {
+  NON_EXPORTED_BASE(public blink::WebKeyboardEvent) {
   NativeWebKeyboardEvent();
 
   explicit NativeWebKeyboardEvent(gfx::NativeEvent native_event);
@@ -37,7 +37,7 @@ struct CONTENT_EXPORT NativeWebKeyboardEvent :
                          int state,
                          double time_stamp_seconds);
 #elif defined(OS_ANDROID)
-  NativeWebKeyboardEvent(WebKit::WebInputEvent::Type type,
+  NativeWebKeyboardEvent(blink::WebInputEvent::Type type,
                          int modifiers,
                          double time_secs,
                          int keycode,
@@ -45,7 +45,7 @@ struct CONTENT_EXPORT NativeWebKeyboardEvent :
                          bool is_system_key);
   // Takes ownership of android_key_event.
   NativeWebKeyboardEvent(jobject android_key_event,
-                         WebKit::WebInputEvent::Type type,
+                         blink::WebInputEvent::Type type,
                          int modifiers,
                          double time_secs,
                          int keycode,
diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h
index 280e1cd..99ed8ca 100644
--- a/content/public/browser/navigation_controller.h
+++ b/content/public/browser/navigation_controller.h
@@ -349,7 +349,7 @@ class NavigationController {
 
   // Random --------------------------------------------------------------------
 
-  // Session storage depends on dom_storage that depends on WebKit::WebString,
+  // Session storage depends on dom_storage that depends on blink::WebString,
   // which cannot be used on iOS.
 #if !defined(OS_IOS)
   // Returns all the SessionStorageNamespace objects that this
diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
index 12b162b..2eed287 100644
--- a/content/public/browser/render_view_host.h
+++ b/content/public/browser/render_view_host.h
@@ -35,7 +35,7 @@ namespace ui {
 struct SelectedFileInfo;
 }
 
-namespace WebKit {
+namespace blink {
 struct WebFindOptions;
 struct WebMediaPlayerAction;
 struct WebPluginAction;
@@ -120,7 +120,7 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost {
   // either in a drop or by being cancelled.
   virtual void DragSourceEndedAt(
       int client_x, int client_y, int screen_x, int screen_y,
-      WebKit::WebDragOperation operation) = 0;
+      blink::WebDragOperation operation) = 0;
 
   // Notifies the renderer that a drag and drop operation is in progress, with
   // droppable items positioned over the renderer's view.
@@ -136,12 +136,12 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost {
       const DropData& drop_data,
       const gfx::Point& client_pt,
       const gfx::Point& screen_pt,
-      WebKit::WebDragOperationsMask operations_allowed,
+      blink::WebDragOperationsMask operations_allowed,
       int key_modifiers) = 0;
   virtual void DragTargetDragOver(
       const gfx::Point& client_pt,
       const gfx::Point& screen_pt,
-      WebKit::WebDragOperationsMask operations_allowed,
+      blink::WebDragOperationsMask operations_allowed,
       int key_modifiers) = 0;
   virtual void DragTargetDragLeave() = 0;
   virtual void DragTargetDrop(const gfx::Point& client_pt,
@@ -167,7 +167,7 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost {
   // located at the given point.
   virtual void ExecuteMediaPlayerActionAtLocation(
       const gfx::Point& location,
-      const WebKit::WebMediaPlayerAction& action) = 0;
+      const blink::WebMediaPlayerAction& action) = 0;
 
   // Runs some javascript within the context of a frame in the page.
   virtual void ExecuteJavascriptInWebFrame(const string16& frame_xpath,
@@ -184,14 +184,14 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost {
   // Tells the renderer to perform the given action on the plugin located at
   // the given point.
   virtual void ExecutePluginActionAtLocation(
-      const gfx::Point& location, const WebKit::WebPluginAction& action) = 0;
+      const gfx::Point& location, const blink::WebPluginAction& action) = 0;
 
   // Asks the renderer to exit fullscreen
   virtual void ExitFullscreen() = 0;
 
   // Finds text on a page.
   virtual void Find(int request_id, const string16& search_text,
-                    const WebKit::WebFindOptions& options) = 0;
+                    const blink::WebFindOptions& options) = 0;
 
   // Notifies the renderer that the user has closed the FindInPage window
   // (and what action to take regarding the selection).
diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h
index e54403c..79176d1 100644
--- a/content/public/browser/render_widget_host.h
+++ b/content/public/browser/render_widget_host.h
@@ -27,7 +27,7 @@ namespace gfx {
 class Rect;
 }
 
-namespace WebKit {
+namespace blink {
 class WebMouseEvent;
 struct WebScreenInfo;
 }
@@ -175,7 +175,7 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender {
   // NotifyTextDirection(). (We may receive keydown events even after we
   // canceled updating the text direction because of auto-repeat.)
   // Note: we cannot undo this change for compatibility with Firefox and IE.
-  virtual void UpdateTextDirection(WebKit::WebTextDirection direction) = 0;
+  virtual void UpdateTextDirection(blink::WebTextDirection direction) = 0;
   virtual void NotifyTextDirection() = 0;
 
   virtual void Focus() = 0;
@@ -221,9 +221,9 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender {
   // Forwards the given message to the renderer. These are called by
   // the view when it has received a message.
   virtual void ForwardMouseEvent(
-      const WebKit::WebMouseEvent& mouse_event) = 0;
+      const blink::WebMouseEvent& mouse_event) = 0;
   virtual void ForwardWheelEvent(
-      const WebKit::WebMouseWheelEvent& wheel_event) = 0;
+      const blink::WebMouseWheelEvent& wheel_event) = 0;
   virtual void ForwardKeyboardEvent(
       const NativeWebKeyboardEvent& key_event) = 0;
 
@@ -298,12 +298,12 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender {
       const KeyPressEventCallback& callback) = 0;
 
   // Add/remove a callback that can handle all kinds of mouse events.
-  typedef base::Callback<bool(const WebKit::WebMouseEvent&)> MouseEventCallback;
+  typedef base::Callback<bool(const blink::WebMouseEvent&)> MouseEventCallback;
   virtual void AddMouseEventCallback(const MouseEventCallback& callback) = 0;
   virtual void RemoveMouseEventCallback(const MouseEventCallback& callback) = 0;
 
   // Get the screen info corresponding to this render widget.
-  virtual void GetWebScreenInfo(WebKit::WebScreenInfo* result) = 0;
+  virtual void GetWebScreenInfo(blink::WebScreenInfo* result) = 0;
 
   // Grabs snapshot from renderer side and returns the bitmap to a callback.
   // If |src_rect| is empty, the whole contents is copied. This is an expensive
diff --git a/content/public/browser/resource_request_info.h b/content/public/browser/resource_request_info.h
index f89b4be..c2e87a1 100644
--- a/content/public/browser/resource_request_info.h
+++ b/content/public/browser/resource_request_info.h
@@ -80,7 +80,7 @@ class ResourceRequestInfo {
   virtual ResourceType::Type GetResourceType() const = 0;
 
   // Returns the associated referrer policy.
-  virtual WebKit::WebReferrerPolicy GetReferrerPolicy() const = 0;
+  virtual blink::WebReferrerPolicy GetReferrerPolicy() const = 0;
 
   // Returns the associated page transition type.
   virtual PageTransition GetPageTransition() const = 0;
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index 924cabb..3e0329b 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -113,7 +113,7 @@ bool WebContentsDelegate::PreHandleKeyboardEvent(
 bool WebContentsDelegate::CanDragEnter(
     WebContents* source,
     const DropData& data,
-    WebKit::WebDragOperationsMask operations_allowed) {
+    blink::WebDragOperationsMask operations_allowed) {
   return true;
 }
 
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index dc7e344..69fc22c 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -53,7 +53,7 @@ class Rect;
 class Size;
 }
 
-namespace WebKit {
+namespace blink {
 class WebLayer;
 struct WebWindowFeatures;
 }
@@ -278,7 +278,7 @@ class CONTENT_EXPORT WebContentsDelegate {
   // cancel the operation. This method is used by Chromium Embedded Framework.
   virtual bool CanDragEnter(WebContents* source,
                             const DropData& data,
-                            WebKit::WebDragOperationsMask operations_allowed);
+                            blink::WebDragOperationsMask operations_allowed);
 
   // Render view drag n drop ended.
   virtual void DragEnded() {}
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h
index 26a3437..ba0bfc4 100644
--- a/content/public/common/common_param_traits_macros.h
+++ b/content/public/common/common_param_traits_macros.h
@@ -29,17 +29,17 @@
 IPC_ENUM_TRAITS(content::ConsoleMessageLevel)
 IPC_ENUM_TRAITS(content::PageTransition)
 IPC_ENUM_TRAITS(content::SecurityStyle)
-IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy)
+IPC_ENUM_TRAITS(blink::WebReferrerPolicy)
 IPC_ENUM_TRAITS(WindowOpenDisposition)
 IPC_ENUM_TRAITS(webkit_glue::EditingBehavior)
 IPC_ENUM_TRAITS(net::RequestPriority)
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebPoint)
   IPC_STRUCT_TRAITS_MEMBER(x)
   IPC_STRUCT_TRAITS_MEMBER(y)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebRect)
   IPC_STRUCT_TRAITS_MEMBER(x)
   IPC_STRUCT_TRAITS_MEMBER(y)
   IPC_STRUCT_TRAITS_MEMBER(width)
@@ -195,7 +195,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences)
 #endif
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(WebKit::WebWindowFeatures)
+IPC_STRUCT_TRAITS_BEGIN(blink::WebWindowFeatures)
   IPC_STRUCT_TRAITS_MEMBER(x)
   IPC_STRUCT_TRAITS_MEMBER(xSet)
   IPC_STRUCT_TRAITS_MEMBER(y)
diff --git a/content/public/common/context_menu_params.cc b/content/public/common/context_menu_params.cc
index 5ec5a1f..4a5f485 100644
--- a/content/public/common/context_menu_params.cc
+++ b/content/public/common/context_menu_params.cc
@@ -15,7 +15,7 @@ CustomContextMenuContext::CustomContextMenuContext()
 }
 
 ContextMenuParams::ContextMenuParams()
-    : media_type(WebKit::WebContextMenuData::MediaTypeNone),
+    : media_type(blink::WebContextMenuData::MediaTypeNone),
       x(0),
       y(0),
       has_image_contents(true),
@@ -27,14 +27,14 @@ ContextMenuParams::ContextMenuParams()
       is_editable(false),
 #if defined(OS_MACOSX)
       writing_direction_default(
-          WebKit::WebContextMenuData::CheckableMenuItemDisabled),
+          blink::WebContextMenuData::CheckableMenuItemDisabled),
       writing_direction_left_to_right(
-          WebKit::WebContextMenuData::CheckableMenuItemEnabled),
+          blink::WebContextMenuData::CheckableMenuItemEnabled),
       writing_direction_right_to_left(
-          WebKit::WebContextMenuData::CheckableMenuItemEnabled),
+          blink::WebContextMenuData::CheckableMenuItemEnabled),
 #endif  // OS_MACOSX
       edit_flags(0),
-      referrer_policy(WebKit::WebReferrerPolicyDefault) {
+      referrer_policy(blink::WebReferrerPolicyDefault) {
 }
 
 ContextMenuParams::~ContextMenuParams() {
diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h
index 053d5ad..a64dd95 100644
--- a/content/public/common/context_menu_params.h
+++ b/content/public/common/context_menu_params.h
@@ -48,7 +48,7 @@ struct CONTENT_EXPORT ContextMenuParams {
   ~ContextMenuParams();
 
   // This is the type of Context Node that the context menu was invoked on.
-  WebKit::WebContextMenuData::MediaType media_type;
+  blink::WebContextMenuData::MediaType media_type;
 
   // These values represent the coordinates of the mouse when the context menu
   // was invoked.  Coords are relative to the associated RenderView's origin.
@@ -143,7 +143,7 @@ struct CONTENT_EXPORT ContextMenuParams {
   std::string frame_charset;
 
   // The referrer policy of the frame on which the menu is invoked.
-  WebKit::WebReferrerPolicy referrer_policy;
+  blink::WebReferrerPolicy referrer_policy;
 
   CustomContextMenuContext custom_context;
   std::vector<MenuItem> custom_items;
diff --git a/content/public/common/drop_data.cc b/content/public/common/drop_data.cc
index 9e42dda..3536efb 100644
--- a/content/public/common/drop_data.cc
+++ b/content/public/common/drop_data.cc
@@ -16,7 +16,7 @@ DropData::FileInfo::FileInfo(const base::string16& path,
 }
 
 DropData::DropData()
-    : referrer_policy(WebKit::WebReferrerPolicyDefault) {
+    : referrer_policy(blink::WebReferrerPolicyDefault) {
 }
 
 DropData::~DropData() {
diff --git a/content/public/common/drop_data.h b/content/public/common/drop_data.h
index 008b3f9..74ad79d 100644
--- a/content/public/common/drop_data.h
+++ b/content/public/common/drop_data.h
@@ -44,7 +44,7 @@ struct CONTENT_EXPORT DropData {
 
   // Referrer policy to use when dragging a link out of the webview results in
   // a download.
-  WebKit::WebReferrerPolicy referrer_policy;
+  blink::WebReferrerPolicy referrer_policy;
 
   // User is dropping one or more files on the webview.
   std::vector<FileInfo> filenames;
diff --git a/content/public/common/menu_item.h b/content/public/common/menu_item.h
index c6c20bc..982832c 100644
--- a/content/public/common/menu_item.h
+++ b/content/public/common/menu_item.h
@@ -17,10 +17,10 @@ namespace content {
 // custom entries of the context menu.
 struct CONTENT_EXPORT MenuItem {
   enum Type {
-    OPTION           = WebKit::WebMenuItemInfo::Option,
-    CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption,
-    GROUP            = WebKit::WebMenuItemInfo::Group,
-    SEPARATOR        = WebKit::WebMenuItemInfo::Separator,
+    OPTION           = blink::WebMenuItemInfo::Option,
+    CHECKABLE_OPTION = blink::WebMenuItemInfo::CheckableOption,
+    GROUP            = blink::WebMenuItemInfo::Group,
+    SEPARATOR        = blink::WebMenuItemInfo::Separator,
     SUBMENU  // This is currently only used by Pepper, not by WebKit.
   };
 
diff --git a/content/public/common/page_state.cc b/content/public/common/page_state.cc
index 54c00e3..1e429b8 100644
--- a/content/public/common/page_state.cc
+++ b/content/public/common/page_state.cc
@@ -76,13 +76,13 @@ PageState PageState::CreateForTesting(
     state.top.http_body.is_null = false;
     if (optional_body_data) {
       ExplodedHttpBodyElement element;
-      element.type = WebKit::WebHTTPBody::Element::TypeData;
+      element.type = blink::WebHTTPBody::Element::TypeData;
       element.data = optional_body_data;
       state.top.http_body.elements.push_back(element);
     }
     if (optional_body_file_path) {
       ExplodedHttpBodyElement element;
-      element.type = WebKit::WebHTTPBody::Element::TypeFile;
+      element.type = blink::WebHTTPBody::Element::TypeFile;
       element.file_path =
           ToNullableString16(optional_body_file_path->AsUTF8Unsafe());
       state.top.http_body.elements.push_back(element);
diff --git a/content/public/common/referrer.h b/content/public/common/referrer.h
index c30f4b8..b10bfd6 100644
--- a/content/public/common/referrer.h
+++ b/content/public/common/referrer.h
@@ -15,14 +15,14 @@ namespace content {
 // applied to this URL. When passing around referrers that will eventually end
 // up being used for URL requests, always use this struct.
 struct CONTENT_EXPORT Referrer {
-  Referrer(const GURL& url, WebKit::WebReferrerPolicy policy) : url(url),
+  Referrer(const GURL& url, blink::WebReferrerPolicy policy) : url(url),
                                                                 policy(policy) {
   }
-  Referrer() : policy(WebKit::WebReferrerPolicyDefault) {
+  Referrer() : policy(blink::WebReferrerPolicyDefault) {
   }
 
   GURL url;
-  WebKit::WebReferrerPolicy policy;
+  blink::WebReferrerPolicy policy;
 };
 
 }  // namespace content
diff --git a/content/public/common/show_desktop_notification_params.cc b/content/public/common/show_desktop_notification_params.cc
index b7e35a6..667e558 100644
--- a/content/public/common/show_desktop_notification_params.cc
+++ b/content/public/common/show_desktop_notification_params.cc
@@ -7,7 +7,7 @@
 namespace content {
 
 ShowDesktopNotificationHostMsgParams::ShowDesktopNotificationHostMsgParams()
-    : is_html(false), direction(WebKit::WebTextDirectionDefault),
+    : is_html(false), direction(blink::WebTextDirectionDefault),
       notification_id(0) {
 }
 
diff --git a/content/public/common/show_desktop_notification_params.h b/content/public/common/show_desktop_notification_params.h
index ef129cc..2782946 100644
--- a/content/public/common/show_desktop_notification_params.h
+++ b/content/public/common/show_desktop_notification_params.h
@@ -31,7 +31,7 @@ struct CONTENT_EXPORT ShowDesktopNotificationHostMsgParams {
   string16 body;
 
   // Directionality of the notification.
-  WebKit::WebTextDirection direction;
+  blink::WebTextDirection direction;
 
   // ReplaceID if this notification should replace an existing one; may be
   // empty if no replacement is called for.
diff --git a/content/public/common/window_container_type.cc b/content/public/common/window_container_type.cc
index a1099e6..ec3b12c 100644
--- a/content/public/common/window_container_type.cc
+++ b/content/public/common/window_container_type.cc
@@ -17,7 +17,7 @@ const char kPersistent[] = "persistent";
 }  // namespace
 
 WindowContainerType WindowFeaturesToContainerType(
-    const WebKit::WebWindowFeatures& window_features) {
+    const blink::WebWindowFeatures& window_features) {
   bool background = false;
   bool persistent = false;
 
diff --git a/content/public/common/window_container_type.h b/content/public/common/window_container_type.h
index 5aec6ed..1d3b46f 100644
--- a/content/public/common/window_container_type.h
+++ b/content/public/common/window_container_type.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
 #define CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
 
-namespace WebKit {
+namespace blink {
 
 struct WebWindowFeatures;
 
@@ -30,6 +30,6 @@ enum WindowContainerType {
 
 // Conversion function:
 WindowContainerType WindowFeaturesToContainerType(
-    const WebKit::WebWindowFeatures& window_features);
+    const blink::WebWindowFeatures& window_features);
 
 #endif  // CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
index fbbe343..d577c18 100644
--- a/content/public/renderer/content_renderer_client.cc
+++ b/content/public/renderer/content_renderer_client.cc
@@ -20,13 +20,13 @@ std::string ContentRendererClient::GetDefaultEncoding() {
 
 bool ContentRendererClient::OverrideCreatePlugin(
     RenderView* render_view,
-    WebKit::WebFrame* frame,
-    const WebKit::WebPluginParams& params,
-    WebKit::WebPlugin** plugin) {
+    blink::WebFrame* frame,
+    const blink::WebPluginParams& params,
+    blink::WebPlugin** plugin) {
   return false;
 }
 
-WebKit::WebPlugin* ContentRendererClient::CreatePluginReplacement(
+blink::WebPlugin* ContentRendererClient::CreatePluginReplacement(
     RenderView* render_view,
     const base::FilePath& plugin_path) {
   return NULL;
@@ -46,40 +46,40 @@ void ContentRendererClient::DeferMediaLoad(RenderView* render_view,
   closure.Run();
 }
 
-WebKit::WebMediaStreamCenter*
+blink::WebMediaStreamCenter*
 ContentRendererClient::OverrideCreateWebMediaStreamCenter(
-    WebKit::WebMediaStreamCenterClient* client) {
+    blink::WebMediaStreamCenterClient* client) {
   return NULL;
 }
 
-WebKit::WebRTCPeerConnectionHandler*
+blink::WebRTCPeerConnectionHandler*
 ContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(
-    WebKit::WebRTCPeerConnectionHandlerClient* client) {
+    blink::WebRTCPeerConnectionHandlerClient* client) {
   return NULL;
 }
 
-WebKit::WebMIDIAccessor*
+blink::WebMIDIAccessor*
 ContentRendererClient::OverrideCreateMIDIAccessor(
-    WebKit::WebMIDIAccessorClient* client) {
+    blink::WebMIDIAccessorClient* client) {
   return NULL;
 }
 
-WebKit::WebAudioDevice*
+blink::WebAudioDevice*
 ContentRendererClient::OverrideCreateAudioDevice(
     double sample_rate) {
   return NULL;
 }
 
-WebKit::WebClipboard* ContentRendererClient::OverrideWebClipboard() {
+blink::WebClipboard* ContentRendererClient::OverrideWebClipboard() {
   return NULL;
 }
 
-WebKit::WebThemeEngine* ContentRendererClient::OverrideThemeEngine() {
+blink::WebThemeEngine* ContentRendererClient::OverrideThemeEngine() {
   return NULL;
 }
 
-WebKit::WebSpeechSynthesizer* ContentRendererClient::OverrideSpeechSynthesizer(
-    WebKit::WebSpeechSynthesizerClient* client) {
+blink::WebSpeechSynthesizer* ContentRendererClient::OverrideSpeechSynthesizer(
+    blink::WebSpeechSynthesizerClient* client) {
   return NULL;
 }
 
@@ -92,15 +92,15 @@ bool ContentRendererClient::AllowPopup() {
 }
 
 bool ContentRendererClient::HandleNavigation(
-    WebKit::WebFrame* frame,
-    const WebKit::WebURLRequest& request,
-    WebKit::WebNavigationType type,
-    WebKit::WebNavigationPolicy default_policy,
+    blink::WebFrame* frame,
+    const blink::WebURLRequest& request,
+    blink::WebNavigationType type,
+    blink::WebNavigationPolicy default_policy,
     bool is_redirect) {
   return false;
 }
 
-bool ContentRendererClient::ShouldFork(WebKit::WebFrame* frame,
+bool ContentRendererClient::ShouldFork(blink::WebFrame* frame,
                                        const GURL& url,
                                        const std::string& http_method,
                                        bool is_initial_navigation,
@@ -110,7 +110,7 @@ bool ContentRendererClient::ShouldFork(WebKit::WebFrame* frame,
 }
 
 bool ContentRendererClient::WillSendRequest(
-    WebKit::WebFrame* frame,
+    blink::WebFrame* frame,
     PageTransition transition_type,
     const GURL& url,
     const GURL& first_party_for_cookies,
@@ -131,14 +131,14 @@ bool ContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
   return false;
 }
 
-WebKit::WebPrescientNetworking*
+blink::WebPrescientNetworking*
 ContentRendererClient::GetPrescientNetworking() {
   return NULL;
 }
 
 bool ContentRendererClient::ShouldOverridePageVisibilityState(
     const RenderView* render_view,
-    WebKit::WebPageVisibilityState* override_state) {
+    blink::WebPageVisibilityState* override_state) {
   return false;
 }
 
@@ -169,12 +169,12 @@ bool ContentRendererClient::IsExternalPepperPlugin(
 }
 
 bool ContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle(
-    WebKit::WebPluginContainer* container) {
+    blink::WebPluginContainer* container) {
   return false;
 }
 
 bool ContentRendererClient::AllowBrowserPlugin(
-    WebKit::WebPluginContainer* container) {
+    blink::WebPluginContainer* container) {
   return false;
 }
 
@@ -195,9 +195,9 @@ bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const {
   return true;
 }
 
-WebKit::WebWorkerPermissionClientProxy*
+blink::WebWorkerPermissionClientProxy*
 ContentRendererClient::CreateWorkerPermissionClientProxy(
-    RenderView* render_view, WebKit::WebFrame* frame) {
+    RenderView* render_view, blink::WebFrame* frame) {
   return NULL;
 }
 
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 86b7e31..9a5baad 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -26,7 +26,7 @@ class FilePath;
 class MessageLoop;
 }
 
-namespace WebKit {
+namespace blink {
 class WebAudioDevice;
 class WebClipboard;
 class WebFrame;
@@ -84,13 +84,13 @@ class CONTENT_EXPORT ContentRendererClient {
   // returns false, the content layer will create the plugin.
   virtual bool OverrideCreatePlugin(
       RenderView* render_view,
-      WebKit::WebFrame* frame,
-      const WebKit::WebPluginParams& params,
-      WebKit::WebPlugin** plugin);
+      blink::WebFrame* frame,
+      const blink::WebPluginParams& params,
+      blink::WebPlugin** plugin);
 
   // Creates a replacement plug-in that is shown when the plug-in at |file_path|
   // couldn't be loaded. This allows the embedder to show a custom placeholder.
-  virtual WebKit::WebPlugin* CreatePluginReplacement(
+  virtual blink::WebPlugin* CreatePluginReplacement(
       RenderView* render_view,
       const base::FilePath& plugin_path);
 
@@ -114,9 +114,9 @@ class CONTENT_EXPORT ContentRendererClient {
   // (lack of information on the error code) so the caller should take care to
   // initialize the string values with safe defaults before the call.
   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) {}
@@ -129,37 +129,37 @@ class CONTENT_EXPORT ContentRendererClient {
 
   // Allows the embedder to override creating a WebMediaStreamCenter. If it
   // returns NULL the content layer will create the stream center.
-  virtual WebKit::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(
-      WebKit::WebMediaStreamCenterClient* client);
+  virtual blink::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(
+      blink::WebMediaStreamCenterClient* client);
 
   // Allows the embedder to override creating a WebRTCPeerConnectionHandler. If
   // it returns NULL the content layer will create the connection handler.
-  virtual WebKit::WebRTCPeerConnectionHandler*
+  virtual blink::WebRTCPeerConnectionHandler*
   OverrideCreateWebRTCPeerConnectionHandler(
-      WebKit::WebRTCPeerConnectionHandlerClient* client);
+      blink::WebRTCPeerConnectionHandlerClient* client);
 
   // Allows the embedder to override creating a WebMIDIAccessor.  If it
   // returns NULL the content layer will create the MIDI accessor.
-  virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(
-      WebKit::WebMIDIAccessorClient* client);
+  virtual blink::WebMIDIAccessor* OverrideCreateMIDIAccessor(
+      blink::WebMIDIAccessorClient* client);
 
   // Allows the embedder to override creating a WebAudioDevice.  If it
   // returns NULL the content layer will create the audio device.
-  virtual WebKit::WebAudioDevice* OverrideCreateAudioDevice(
+  virtual blink::WebAudioDevice* OverrideCreateAudioDevice(
       double sample_rate);
 
-  // Allows the embedder to override the WebKit::WebClipboard used. If it
+  // Allows the embedder to override the blink::WebClipboard used. If it
   // returns NULL the content layer will handle clipboard interactions.
-  virtual WebKit::WebClipboard* OverrideWebClipboard();
+  virtual blink::WebClipboard* OverrideWebClipboard();
 
   // Allows the embedder to override the WebThemeEngine used. If it returns NULL
   // the content layer will provide an engine.
-  virtual WebKit::WebThemeEngine* OverrideThemeEngine();
+  virtual blink::WebThemeEngine* OverrideThemeEngine();
 
   // Allows the embedder to override the WebSpeechSynthesizer used.
   // If it returns NULL the content layer will provide an engine.
-  virtual WebKit::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
-      WebKit::WebSpeechSynthesizerClient* client);
+  virtual blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
+      blink::WebSpeechSynthesizerClient* client);
 
   // Returns true if the renderer process should schedule the idle handler when
   // all widgets are hidden.
@@ -170,17 +170,17 @@ class CONTENT_EXPORT ContentRendererClient {
 
   // Returns true if the navigation was handled by the embedder and should be
   // ignored by WebKit. This method is used by CEF.
-  virtual bool HandleNavigation(WebKit::WebFrame* frame,
-                                const WebKit::WebURLRequest& request,
-                                WebKit::WebNavigationType type,
-                                WebKit::WebNavigationPolicy default_policy,
+  virtual bool HandleNavigation(blink::WebFrame* frame,
+                                const blink::WebURLRequest& request,
+                                blink::WebNavigationType type,
+                                blink::WebNavigationPolicy default_policy,
                                 bool is_redirect);
 
   // Returns true if we should fork a new process for the given navigation.
   // If |send_referrer| is set to false (which is the default), no referrer
   // header will be send for the navigation. Otherwise, the referrer header is
   // set according to the frame's referrer policy.
-  virtual bool ShouldFork(WebKit::WebFrame* frame,
+  virtual bool ShouldFork(blink::WebFrame* frame,
                           const GURL& url,
                           const std::string& http_method,
                           bool is_initial_navigation,
@@ -189,7 +189,7 @@ class CONTENT_EXPORT ContentRendererClient {
 
   // Notifies the embedder that the given frame is requesting the resource at
   // |url|.  If the function returns true, the url is changed to |new_url|.
-  virtual bool WillSendRequest(WebKit::WebFrame* frame,
+  virtual bool WillSendRequest(blink::WebFrame* frame,
                                PageTransition transition_type,
                                const GURL& url,
                                const GURL& first_party_for_cookies,
@@ -199,23 +199,23 @@ class CONTENT_EXPORT ContentRendererClient {
   // embedder can potentiall put up a modal dialog on the UI thread as a result.
   virtual bool ShouldPumpEventsDuringCookieMessage();
 
-  // See the corresponding functions in WebKit::WebFrameClient.
-  virtual void DidCreateScriptContext(WebKit::WebFrame* frame,
+  // See the corresponding functions in blink::WebFrameClient.
+  virtual void DidCreateScriptContext(blink::WebFrame* frame,
                                       v8::Handle<v8::Context> context,
                                       int extension_group,
                                       int world_id) {}
-  virtual void WillReleaseScriptContext(WebKit::WebFrame* frame,
+  virtual void WillReleaseScriptContext(blink::WebFrame* frame,
                                         v8::Handle<v8::Context>,
                                         int world_id) {}
 
-  // See WebKit::Platform.
+  // See blink::Platform.
   virtual unsigned long long VisitedLinkHash(const char* canonical_url,
                                              size_t length);
   virtual bool IsLinkVisited(unsigned long long link_hash);
-  virtual WebKit::WebPrescientNetworking* GetPrescientNetworking();
+  virtual blink::WebPrescientNetworking* GetPrescientNetworking();
   virtual bool ShouldOverridePageVisibilityState(
       const RenderView* render_view,
-      WebKit::WebPageVisibilityState* override_state);
+      blink::WebPageVisibilityState* override_state);
 
   // Return true if the GetCookie request will be handled by the embedder.
   // Cookies are returned in the cookie parameter.
@@ -243,10 +243,10 @@ class CONTENT_EXPORT ContentRendererClient {
   // pp::FileIO::RequestOSFileHandle.
   // TODO(teravest): Remove this when FileIO is moved to the browser.
   virtual bool IsPluginAllowedToCallRequestOSFileHandle(
-      WebKit::WebPluginContainer* container);
+      blink::WebPluginContainer* container);
 
   // Returns whether BrowserPlugin should be allowed within the |container|.
-  virtual bool AllowBrowserPlugin(WebKit::WebPluginContainer* container);
+  virtual bool AllowBrowserPlugin(blink::WebPluginContainer* container);
 
   // Returns true if the page at |url| can use Pepper MediaStream APIs.
   virtual bool AllowPepperMediaStreamAPI(const GURL& url);
@@ -268,9 +268,9 @@ class CONTENT_EXPORT ContentRendererClient {
   virtual bool ShouldEnableSiteIsolationPolicy() const;
 
   // Creates a permission client proxy for in-renderer worker.
-  virtual WebKit::WebWorkerPermissionClientProxy*
+  virtual blink::WebWorkerPermissionClientProxy*
       CreateWorkerPermissionClientProxy(RenderView* render_view,
-                                        WebKit::WebFrame* frame);
+                                        blink::WebFrame* frame);
 };
 
 }  // namespace content
diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h
index cd9fd58..11b7d5e 100644
--- a/content/public/renderer/document_state.h
+++ b/content/public/renderer/document_state.h
@@ -22,7 +22,7 @@ class NavigationState;
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
 class CONTENT_EXPORT DocumentState
-    : NON_EXPORTED_BASE(public WebKit::WebDataSource::ExtraData),
+    : NON_EXPORTED_BASE(public blink::WebDataSource::ExtraData),
       public base::SupportsUserData {
  public:
   // The exact values of this enum are used in histograms, so new values must be
@@ -43,7 +43,7 @@ class CONTENT_EXPORT DocumentState
   DocumentState();
   virtual ~DocumentState();
 
-  static DocumentState* FromDataSource(WebKit::WebDataSource* ds) {
+  static DocumentState* FromDataSource(blink::WebDataSource* ds) {
     return static_cast<DocumentState*>(ds->extraData());
   }
 
diff --git a/content/public/renderer/history_item_serialization.cc b/content/public/renderer/history_item_serialization.cc
index 9ca4135..96309c9 100644
--- a/content/public/renderer/history_item_serialization.cc
+++ b/content/public/renderer/history_item_serialization.cc
@@ -13,11 +13,11 @@
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
 
-using WebKit::WebHTTPBody;
-using WebKit::WebHistoryItem;
-using WebKit::WebSerializedScriptValue;
-using WebKit::WebString;
-using WebKit::WebVector;
+using blink::WebHTTPBody;
+using blink::WebHistoryItem;
+using blink::WebSerializedScriptValue;
+using blink::WebString;
+using blink::WebVector;
 
 namespace content {
 namespace {
diff --git a/content/public/renderer/history_item_serialization.h b/content/public/renderer/history_item_serialization.h
index 44eb1e1..dda1cf4 100644
--- a/content/public/renderer/history_item_serialization.h
+++ b/content/public/renderer/history_item_serialization.h
@@ -9,7 +9,7 @@
 
 #include "content/common/content_export.h"
 
-namespace WebKit {
+namespace blink {
 class WebHistoryItem;
 }
 
@@ -17,8 +17,8 @@ namespace content {
 class PageState;
 
 CONTENT_EXPORT PageState HistoryItemToPageState(
-    const WebKit::WebHistoryItem& item);
-CONTENT_EXPORT WebKit::WebHistoryItem PageStateToHistoryItem(
+    const blink::WebHistoryItem& item);
+CONTENT_EXPORT blink::WebHistoryItem PageStateToHistoryItem(
     const PageState& state);
 
 }  // namespace content
diff --git a/content/public/renderer/pepper_plugin_instance.h b/content/public/renderer/pepper_plugin_instance.h
index 50e3523..511f311 100644
--- a/content/public/renderer/pepper_plugin_instance.h
+++ b/content/public/renderer/pepper_plugin_instance.h
@@ -32,7 +32,7 @@ namespace IPC {
 struct ChannelHandle;
 }
 
-namespace WebKit {
+namespace blink {
 class WebPluginContainer;
 }
 
@@ -51,7 +51,7 @@ class PepperPluginInstance {
 
   virtual content::RenderView* GetRenderView() = 0;
 
-  virtual WebKit::WebPluginContainer* GetContainer() = 0;
+  virtual blink::WebPluginContainer* GetContainer() = 0;
 
   virtual v8::Isolate* GetIsolate() const = 0;
 
diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h
index 0978535..01857c7 100644
--- a/content/public/renderer/render_view.h
+++ b/content/public/renderer/render_view.h
@@ -18,7 +18,7 @@
 
 struct WebPreferences;
 
-namespace WebKit {
+namespace blink {
 class WebFrame;
 class WebNode;
 class WebPlugin;
@@ -44,7 +44,7 @@ struct WebPluginInfo;
 class CONTENT_EXPORT RenderView : public IPC::Sender {
  public:
   // Returns the RenderView containing the given WebView.
-  static RenderView* FromWebView(WebKit::WebView* webview);
+  static RenderView* FromWebView(blink::WebView* webview);
 
   // Returns the RenderView for the given routing ID.
   static RenderView* FromRoutingID(int routing_id);
@@ -75,24 +75,24 @@ class CONTENT_EXPORT RenderView : public IPC::Sender {
   virtual void SetWebkitPreferences(const WebPreferences& preferences) = 0;
 
   // Returns the associated WebView. May return NULL when the view is closing.
-  virtual WebKit::WebView* GetWebView() = 0;
+  virtual blink::WebView* GetWebView() = 0;
 
   // Gets the focused node. If no such node exists then the node will be isNull.
-  virtual WebKit::WebNode GetFocusedNode() const = 0;
+  virtual blink::WebNode GetFocusedNode() const = 0;
 
   // Gets the node that the context menu was pressed over.
-  virtual WebKit::WebNode GetContextMenuNode() const = 0;
+  virtual blink::WebNode GetContextMenuNode() const = 0;
 
   // Returns true if the parameter node is a textfield, text area, a content
   // editable div, or has an ARIA role of textbox.
-  virtual bool IsEditableNode(const WebKit::WebNode& node) const = 0;
+  virtual bool IsEditableNode(const blink::WebNode& node) const = 0;
 
   // Create a new NPAPI/Pepper plugin depending on |info|. Returns NULL if no
   // plugin was found.
-  virtual WebKit::WebPlugin* CreatePlugin(
-      WebKit::WebFrame* frame,
+  virtual blink::WebPlugin* CreatePlugin(
+      blink::WebFrame* frame,
       const WebPluginInfo& info,
-      const WebKit::WebPluginParams& params) = 0;
+      const blink::WebPluginParams& params) = 0;
 
   // Evaluates a string of JavaScript in a particular frame.
   virtual void EvaluateScript(const string16& frame_xpath,
@@ -135,18 +135,18 @@ class CONTENT_EXPORT RenderView : public IPC::Sender {
   virtual void CancelContextMenu(int request_id) = 0;
 
   // Returns the current visibility of the WebView.
-  virtual WebKit::WebPageVisibilityState GetVisibilityState() const = 0;
+  virtual blink::WebPageVisibilityState GetVisibilityState() const = 0;
 
   // Displays a modal alert dialog containing the given message.  Returns
   // once the user dismisses the dialog.
-  virtual void RunModalAlertDialog(WebKit::WebFrame* frame,
-                                   const WebKit::WebString& message) = 0;
+  virtual void RunModalAlertDialog(blink::WebFrame* frame,
+                                   const blink::WebString& message) = 0;
 
   // The client should handle the navigation externally.
   virtual void LoadURLExternally(
-      WebKit::WebFrame* frame,
-      const WebKit::WebURLRequest& request,
-      WebKit::WebNavigationPolicy policy) = 0;
+      blink::WebFrame* frame,
+      const blink::WebURLRequest& request,
+      blink::WebNavigationPolicy policy) = 0;
 
   // Used by plugins that load data in this RenderView to update the loading
   // notifications.
@@ -163,7 +163,7 @@ class CONTENT_EXPORT RenderView : public IPC::Sender {
   virtual void ClearEditCommands() = 0;
 
   // Returns a collection of security info about |frame|.
-  virtual SSLStatus GetSSLStatusOfFrame(WebKit::WebFrame* frame) const = 0;
+  virtual SSLStatus GetSSLStatusOfFrame(blink::WebFrame* frame) const = 0;
 
   // Returns |renderer_preferences_.accept_languages| value.
   virtual const std::string& GetAcceptLanguages() const = 0;
diff --git a/content/public/renderer/render_view_observer.cc b/content/public/renderer/render_view_observer.cc
index c0271c1..dd439cf 100644
--- a/content/public/renderer/render_view_observer.cc
+++ b/content/public/renderer/render_view_observer.cc
@@ -6,7 +6,7 @@
 
 #include "content/renderer/render_view_impl.h"
 
-using WebKit::WebFrame;
+using blink::WebFrame;
 
 namespace content {
 
diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h
index d4ad79a..f3d1094 100644
--- a/content/public/renderer/render_view_observer.h
+++ b/content/public/renderer/render_view_observer.h
@@ -21,7 +21,7 @@ class PpapiHost;
 }
 }
 
-namespace WebKit {
+namespace blink {
 class WebDataSource;
 class WebFrame;
 class WebFormElement;
@@ -53,48 +53,48 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Listener,
   // These match the WebKit API notifications
   virtual void DidStartLoading() {}
   virtual void DidStopLoading() {}
-  virtual void DidFinishDocumentLoad(WebKit::WebFrame* frame) {}
-  virtual void DidFailLoad(WebKit::WebFrame* frame,
-                           const WebKit::WebURLError& error) {}
-  virtual void DidFinishLoad(WebKit::WebFrame* frame) {}
-  virtual void DidStartProvisionalLoad(WebKit::WebFrame* frame) {}
-  virtual void DidFailProvisionalLoad(WebKit::WebFrame* frame,
-                                      const WebKit::WebURLError& error) {}
-  virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
+  virtual void DidFinishDocumentLoad(blink::WebFrame* frame) {}
+  virtual void DidFailLoad(blink::WebFrame* frame,
+                           const blink::WebURLError& error) {}
+  virtual void DidFinishLoad(blink::WebFrame* frame) {}
+  virtual void DidStartProvisionalLoad(blink::WebFrame* frame) {}
+  virtual void DidFailProvisionalLoad(blink::WebFrame* frame,
+                                      const blink::WebURLError& error) {}
+  virtual void DidCommitProvisionalLoad(blink::WebFrame* frame,
                                         bool is_new_navigation) {}
-  virtual void DidClearWindowObject(WebKit::WebFrame* frame) {}
-  virtual void DidCreateDocumentElement(WebKit::WebFrame* frame) {}
-  virtual void FrameCreated(WebKit::WebFrame* parent,
-                            WebKit::WebFrame* frame) {}
-  virtual void FrameDetached(WebKit::WebFrame* frame) {}
-  virtual void FrameWillClose(WebKit::WebFrame* frame) {}
+  virtual void DidClearWindowObject(blink::WebFrame* frame) {}
+  virtual void DidCreateDocumentElement(blink::WebFrame* frame) {}
+  virtual void FrameCreated(blink::WebFrame* parent,
+                            blink::WebFrame* frame) {}
+  virtual void FrameDetached(blink::WebFrame* frame) {}
+  virtual void FrameWillClose(blink::WebFrame* frame) {}
   virtual void DidMatchCSS(
-      WebKit::WebFrame* frame,
-      const WebKit::WebVector<WebKit::WebString>& newly_matching_selectors,
-      const WebKit::WebVector<WebKit::WebString>& stopped_matching_selectors) {}
-  virtual void WillSendSubmitEvent(WebKit::WebFrame* frame,
-                                   const WebKit::WebFormElement& form) {}
-  virtual void WillSubmitForm(WebKit::WebFrame* frame,
-                              const WebKit::WebFormElement& form) {}
-  virtual void DidCreateDataSource(WebKit::WebFrame* frame,
-                                   WebKit::WebDataSource* ds) {}
-  virtual void PrintPage(WebKit::WebFrame* frame, bool user_initiated) {}
-  virtual void FocusedNodeChanged(const WebKit::WebNode& node) {}
-  virtual void WillCreateMediaPlayer(WebKit::WebFrame* frame,
-                                     WebKit::WebMediaPlayerClient* client) {}
+      blink::WebFrame* frame,
+      const blink::WebVector<blink::WebString>& newly_matching_selectors,
+      const blink::WebVector<blink::WebString>& stopped_matching_selectors) {}
+  virtual void WillSendSubmitEvent(blink::WebFrame* frame,
+                                   const blink::WebFormElement& form) {}
+  virtual void WillSubmitForm(blink::WebFrame* frame,
+                              const blink::WebFormElement& form) {}
+  virtual void DidCreateDataSource(blink::WebFrame* frame,
+                                   blink::WebDataSource* ds) {}
+  virtual void PrintPage(blink::WebFrame* frame, bool user_initiated) {}
+  virtual void FocusedNodeChanged(const blink::WebNode& node) {}
+  virtual void WillCreateMediaPlayer(blink::WebFrame* frame,
+                                     blink::WebMediaPlayerClient* client) {}
   virtual void ZoomLevelChanged() {};
-  virtual void DidChangeScrollOffset(WebKit::WebFrame* frame) {}
-  virtual void DraggableRegionsChanged(WebKit::WebFrame* frame) {}
+  virtual void DidChangeScrollOffset(blink::WebFrame* frame) {}
+  virtual void DraggableRegionsChanged(blink::WebFrame* frame) {}
   virtual void DidRequestShowContextMenu(
-      WebKit::WebFrame* frame,
-      const WebKit::WebContextMenuData& data) {}
+      blink::WebFrame* frame,
+      const blink::WebContextMenuData& data) {}
   virtual void DidCommitCompositorFrame() {}
   virtual void DidUpdateLayout() {}
 
   // These match the RenderView methods.
-  virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event) {}
-  virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) {}
-  virtual void DidHandleGestureEvent(const WebKit::WebGestureEvent& event) {}
+  virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) {}
+  virtual void DidHandleTouchEvent(const blink::WebTouchEvent& event) {}
+  virtual void DidHandleGestureEvent(const blink::WebGestureEvent& event) {}
   virtual void DidCreatePepperPlugin(RendererPpapiHost* host) {}
 
   // Called when we receive a console message from WebKit for which we requested
diff --git a/content/public/renderer/renderer_ppapi_host.h b/content/public/renderer/renderer_ppapi_host.h
index 123257d..298a04d 100644
--- a/content/public/renderer/renderer_ppapi_host.h
+++ b/content/public/renderer/renderer_ppapi_host.h
@@ -34,7 +34,7 @@ class PpapiHost;
 }
 }
 
-namespace WebKit {
+namespace blink {
 class WebPluginContainer;
 }
 
@@ -77,7 +77,7 @@ class RendererPpapiHost {
 
   // Returns the WebPluginContainer for the given plugin instance, or NULL if
   // the instance is invalid.
-  virtual WebKit::WebPluginContainer* GetContainerForInstance(
+  virtual blink::WebPluginContainer* GetContainerForInstance(
       PP_Instance instance) const = 0;
 
   // Returns the PID of the child process containing the plugin. If running
diff --git a/content/public/renderer/web_preferences.h b/content/public/renderer/web_preferences.h
index f383843..a610473 100644
--- a/content/public/renderer/web_preferences.h
+++ b/content/public/renderer/web_preferences.h
@@ -9,14 +9,14 @@
 
 struct WebPreferences;
 
-namespace WebKit {
+namespace blink {
 class WebView;
 }
 
 namespace content {
 
 CONTENT_EXPORT void ApplyWebPreferences(const WebPreferences& prefs,
-                                        WebKit::WebView* web_view);
+                                        blink::WebView* web_view);
 
 }  // namespace content
 
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index f16b854..b18be14 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -118,7 +118,7 @@ bool ExecuteScriptHelper(RenderViewHost* render_view_host,
   return true;
 }
 
-void BuildSimpleWebKeyEvent(WebKit::WebInputEvent::Type type,
+void BuildSimpleWebKeyEvent(blink::WebInputEvent::Type type,
                             ui::KeyboardCode key_code,
                             int native_key_code,
                             int modifiers,
@@ -132,15 +132,15 @@ void BuildSimpleWebKeyEvent(WebKit::WebInputEvent::Type type,
   event->timeStampSeconds = base::Time::Now().ToDoubleT();
   event->skip_in_browser = true;
 
-  if (type == WebKit::WebInputEvent::Char ||
-      type == WebKit::WebInputEvent::RawKeyDown) {
+  if (type == blink::WebInputEvent::Char ||
+      type == blink::WebInputEvent::RawKeyDown) {
     event->text[0] = key_code;
     event->unmodifiedText[0] = key_code;
   }
 }
 
 void InjectRawKeyEvent(WebContents* web_contents,
-                       WebKit::WebInputEvent::Type type,
+                       blink::WebInputEvent::Type type,
                        ui::KeyboardCode key_code,
                        int native_key_code,
                        int modifiers) {
@@ -222,7 +222,7 @@ void CrashTab(WebContents* web_contents) {
 
 void SimulateMouseClick(WebContents* web_contents,
                         int modifiers,
-                        WebKit::WebMouseEvent::Button button) {
+                        blink::WebMouseEvent::Button button) {
   int x = web_contents->GetView()->GetContainerSize().width() / 2;
   int y = web_contents->GetView()->GetContainerSize().height() / 2;
   SimulateMouseClickAt(web_contents, modifiers, button, gfx::Point(x, y));
@@ -230,10 +230,10 @@ void SimulateMouseClick(WebContents* web_contents,
 
 void SimulateMouseClickAt(WebContents* web_contents,
                           int modifiers,
-                          WebKit::WebMouseEvent::Button button,
+                          blink::WebMouseEvent::Button button,
                           const gfx::Point& point) {
-  WebKit::WebMouseEvent mouse_event;
-  mouse_event.type = WebKit::WebInputEvent::MouseDown;
+  blink::WebMouseEvent mouse_event;
+  mouse_event.type = blink::WebInputEvent::MouseDown;
   mouse_event.button = button;
   mouse_event.x = point.x();
   mouse_event.y = point.y();
@@ -245,14 +245,14 @@ void SimulateMouseClickAt(WebContents* web_contents,
   mouse_event.globalY = point.y() + offset.y();
   mouse_event.clickCount = 1;
   web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
-  mouse_event.type = WebKit::WebInputEvent::MouseUp;
+  mouse_event.type = blink::WebInputEvent::MouseUp;
   web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
 }
 
 void SimulateMouseEvent(WebContents* web_contents,
-                        WebKit::WebInputEvent::Type type,
+                        blink::WebInputEvent::Type type,
                         const gfx::Point& point) {
-  WebKit::WebMouseEvent mouse_event;
+  blink::WebMouseEvent mouse_event;
   mouse_event.type = type;
   mouse_event.x = point.x();
   mouse_event.y = point.y();
@@ -284,40 +284,40 @@ void SimulateKeyPressWithCode(WebContents* web_contents,
   // The order of these key down events shouldn't matter for our simulation.
   // For our simulation we can use either the left keys or the right keys.
   if (control) {
-    modifiers |= WebKit::WebInputEvent::ControlKey;
+    modifiers |= blink::WebInputEvent::ControlKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::RawKeyDown,
+        blink::WebInputEvent::RawKeyDown,
         ui::VKEY_CONTROL,
         key_converter->CodeToNativeKeycode("ControlLeft"),
         modifiers);
   }
 
   if (shift) {
-    modifiers |= WebKit::WebInputEvent::ShiftKey;
+    modifiers |= blink::WebInputEvent::ShiftKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::RawKeyDown,
+        blink::WebInputEvent::RawKeyDown,
         ui::VKEY_SHIFT,
         key_converter->CodeToNativeKeycode("ShiftLeft"),
         modifiers);
   }
 
   if (alt) {
-    modifiers |= WebKit::WebInputEvent::AltKey;
+    modifiers |= blink::WebInputEvent::AltKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::RawKeyDown,
+        blink::WebInputEvent::RawKeyDown,
         ui::VKEY_MENU,
         key_converter->CodeToNativeKeycode("AltLeft"),
         modifiers);
   }
 
   if (command) {
-    modifiers |= WebKit::WebInputEvent::MetaKey;
+    modifiers |= blink::WebInputEvent::MetaKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::RawKeyDown,
+        blink::WebInputEvent::RawKeyDown,
         ui::VKEY_COMMAND,
         key_converter->CodeToNativeKeycode("OSLeft"),
         modifiers);
@@ -325,61 +325,61 @@ void SimulateKeyPressWithCode(WebContents* web_contents,
 
   InjectRawKeyEvent(
       web_contents,
-      WebKit::WebInputEvent::RawKeyDown,
+      blink::WebInputEvent::RawKeyDown,
       key_code,
       native_key_code,
       modifiers);
 
   InjectRawKeyEvent(
       web_contents,
-      WebKit::WebInputEvent::Char,
+      blink::WebInputEvent::Char,
       key_code,
       native_key_code,
       modifiers);
 
   InjectRawKeyEvent(
       web_contents,
-      WebKit::WebInputEvent::KeyUp,
+      blink::WebInputEvent::KeyUp,
       key_code,
       native_key_code,
       modifiers);
 
   // The order of these key releases shouldn't matter for our simulation.
   if (control) {
-    modifiers &= ~WebKit::WebInputEvent::ControlKey;
+    modifiers &= ~blink::WebInputEvent::ControlKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::KeyUp,
+        blink::WebInputEvent::KeyUp,
         ui::VKEY_CONTROL,
         key_converter->CodeToNativeKeycode("ControlLeft"),
         modifiers);
   }
 
   if (shift) {
-    modifiers &= ~WebKit::WebInputEvent::ShiftKey;
+    modifiers &= ~blink::WebInputEvent::ShiftKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::KeyUp,
+        blink::WebInputEvent::KeyUp,
         ui::VKEY_SHIFT,
         key_converter->CodeToNativeKeycode("ShiftLeft"),
         modifiers);
   }
 
   if (alt) {
-    modifiers &= ~WebKit::WebInputEvent::AltKey;
+    modifiers &= ~blink::WebInputEvent::AltKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::KeyUp,
+        blink::WebInputEvent::KeyUp,
         ui::VKEY_MENU,
         key_converter->CodeToNativeKeycode("AltLeft"),
         modifiers);
   }
 
   if (command) {
-    modifiers &= ~WebKit::WebInputEvent::MetaKey;
+    modifiers &= ~blink::WebInputEvent::MetaKey;
     InjectRawKeyEvent(
         web_contents,
-        WebKit::WebInputEvent::KeyUp,
+        blink::WebInputEvent::KeyUp,
         ui::VKEY_COMMAND,
         key_converter->CodeToNativeKeycode("OSLeft"),
         modifiers);
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index a0f490295..53b40ec 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -65,18 +65,18 @@ void CrashTab(WebContents* web_contents);
 // may contain bits from WebInputEvent::Modifiers.
 void SimulateMouseClick(WebContents* web_contents,
                         int modifiers,
-                        WebKit::WebMouseEvent::Button button);
+                        blink::WebMouseEvent::Button button);
 
 // Simulates clicking at the point |point| of the given tab asynchronously;
 // modifiers may contain bits from WebInputEvent::Modifiers.
 void SimulateMouseClickAt(WebContents* web_contents,
                           int modifiers,
-                          WebKit::WebMouseEvent::Button button,
+                          blink::WebMouseEvent::Button button,
                           const gfx::Point& point);
 
 // Simulates asynchronously a mouse enter/move/leave event.
 void SimulateMouseEvent(WebContents* web_contents,
-                        WebKit::WebInputEvent::Type type,
+                        blink::WebInputEvent::Type type,
                         const gfx::Point& point);
 
 // Sends a key press asynchronously.
diff --git a/content/public/test/layouttest_support.h b/content/public/test/layouttest_support.h
index 7e56763..91a8098 100644
--- a/content/public/test/layouttest_support.h
+++ b/content/public/test/layouttest_support.h
@@ -7,7 +7,7 @@
 
 #include "base/callback_forward.h"
 
-namespace WebKit {
+namespace blink {
 class WebDeviceMotionData;
 class WebDeviceOrientationData;
 class WebGamepads;
@@ -39,15 +39,15 @@ void EnableWebTestProxyCreation(const base::Callback<
 
 // Sets the WebGamepads that should be returned by
 // WebKitPlatformSupport::sampleGamepads().
-void SetMockGamepads(const WebKit::WebGamepads& pads);
+void SetMockGamepads(const blink::WebGamepads& pads);
 
 // Sets WebDeviceMotionData that should be used when registering
 // a listener through WebKitPlatformSupport::setDeviceMotionListener().
-void SetMockDeviceMotionData(const WebKit::WebDeviceMotionData& data);
+void SetMockDeviceMotionData(const blink::WebDeviceMotionData& data);
 
 // Sets WebDeviceOrientationData that should be used when registering
 // a listener through WebKitPlatformSupport::setDeviceOrientationListener().
-void SetMockDeviceOrientationData(const WebKit::WebDeviceOrientationData& data);
+void SetMockDeviceOrientationData(const blink::WebDeviceOrientationData& data);
 
 // Returns the length of the local session history of a render view.
 int GetLocalSessionHistoryLength(RenderView* render_view);
@@ -62,7 +62,7 @@ void SetFocusAndActivate(RenderView* render_view, bool enable);
 
 // Changes the window rect of the given render view.
 void ForceResizeRenderView(RenderView* render_view,
-                           const WebKit::WebSize& new_size);
+                           const blink::WebSize& new_size);
 
 // Set the device scale factor and force the compositor to resize.
 void SetDeviceScaleFactor(RenderView* render_view, float factor);
@@ -76,10 +76,10 @@ void UseSynchronousResizeMode(RenderView* render_view, bool enable);
 
 // Control auto resize mode.
 void EnableAutoResizeMode(RenderView* render_view,
-                          const WebKit::WebSize& min_size,
-                          const WebKit::WebSize& max_size);
+                          const blink::WebSize& min_size,
+                          const blink::WebSize& max_size);
 void DisableAutoResizeMode(RenderView* render_view,
-                           const WebKit::WebSize& new_size);
+                           const blink::WebSize& new_size);
 
 // Forces the |render_view| to use mock media streams.
 void UseMockMediaStreams(RenderView* render_view);
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 7ada255..4862675 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -160,7 +160,7 @@ scoped_ptr<base::SharedMemory>
 }
 
 void MockRenderThread::RegisterExtension(v8::Extension* extension) {
-  WebKit::WebScriptController::registerExtension(extension);
+  blink::WebScriptController::registerExtension(extension);
 }
 
 void MockRenderThread::ScheduleIdleHandler(int64 initial_delay_ms) {
@@ -207,7 +207,7 @@ void MockRenderThread::SendCloseMessage() {
 
 // The Widget expects to be returned valid route_id.
 void MockRenderThread::OnCreateWidget(int opener_id,
-                                      WebKit::WebPopupType popup_type,
+                                      blink::WebPopupType popup_type,
                                       int* route_id,
                                       int* surface_id) {
   opener_id_ = opener_id;
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index 17b4fc5..ec03c78 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -113,7 +113,7 @@ class MockRenderThread : public RenderThread {
 
   // The Widget expects to be returned valid route_id.
   void OnCreateWidget(int opener_id,
-                      WebKit::WebPopupType popup_type,
+                      blink::WebPopupType popup_type,
                       int* route_id,
                       int* surface_id);
 
diff --git a/content/public/test/render_view_fake_resources_test.cc b/content/public/test/render_view_fake_resources_test.cc
index e76ed5a..63fd31a 100644
--- a/content/public/test/render_view_fake_resources_test.cc
+++ b/content/public/test/render_view_fake_resources_test.cc
@@ -113,20 +113,20 @@ RenderView* RenderViewFakeResourcesTest::view() {
   return view_;
 }
 
-WebKit::WebFrame* RenderViewFakeResourcesTest::GetMainFrame() {
+blink::WebFrame* RenderViewFakeResourcesTest::GetMainFrame() {
   return view_->GetWebView()->mainFrame();
 }
 
 void RenderViewFakeResourcesTest::LoadURL(const std::string& url) {
   GURL g_url(url);
-  GetMainFrame()->loadRequest(WebKit::WebURLRequest(g_url));
+  GetMainFrame()->loadRequest(blink::WebURLRequest(g_url));
   message_loop_.Run();
 }
 
 void RenderViewFakeResourcesTest::LoadURLWithPost(const std::string& url) {
   GURL g_url(url);
-  WebKit::WebURLRequest request(g_url);
-  request.setHTTPMethod(WebKit::WebString::fromUTF8("POST"));
+  blink::WebURLRequest request(g_url);
+  request.setHTTPMethod(blink::WebString::fromUTF8("POST"));
   GetMainFrame()->loadRequest(request);
   message_loop_.Run();
 }
@@ -136,7 +136,7 @@ void RenderViewFakeResourcesTest::GoBack() {
 }
 
 void RenderViewFakeResourcesTest::GoForward(
-    const WebKit::WebHistoryItem& history_item) {
+    const blink::WebHistoryItem& history_item) {
   GoToOffset(1, history_item);
 }
 
@@ -203,7 +203,7 @@ void RenderViewFakeResourcesTest::OnRenderViewReady() {
 
 void RenderViewFakeResourcesTest::GoToOffset(
     int offset,
-    const WebKit::WebHistoryItem& history_item) {
+    const blink::WebHistoryItem& history_item) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   ViewMsg_Navigate_Params params;
   params.page_id = impl->GetPageId() + offset;
diff --git a/content/public/test/render_view_fake_resources_test.h b/content/public/test/render_view_fake_resources_test.h
index ce2f6d1..d4a0deb 100644
--- a/content/public/test/render_view_fake_resources_test.h
+++ b/content/public/test/render_view_fake_resources_test.h
@@ -58,7 +58,7 @@ namespace IPC {
 class Channel;
 }
 
-namespace WebKit {
+namespace blink {
 class WebFrame;
 class WebHistoryItem;
 }
@@ -104,10 +104,10 @@ class RenderViewFakeResourcesTest : public ::testing::Test,
   // forward navigations, the caller needs to capture the WebHistoryItem
   // for the page to go forward to (before going back) and pass it to
   // this method.  The WebHistoryItem is available from the WebFrame.
-  void GoForward(const WebKit::WebHistoryItem& history_item);
+  void GoForward(const blink::WebHistoryItem& history_item);
 
   // Returns the main WebFrame for our RenderView.
-  WebKit::WebFrame* GetMainFrame();
+  blink::WebFrame* GetMainFrame();
 
   // IPC message handlers below
 
@@ -142,7 +142,7 @@ class RenderViewFakeResourcesTest : public ::testing::Test,
 
  private:
   // A helper for GoBack and GoForward.
-  void GoToOffset(int offset, const WebKit::WebHistoryItem& history_item);
+  void GoToOffset(int offset, const blink::WebHistoryItem& history_item);
 
   // The previous state for whether sandbox support was enabled in
   // RenderViewWebKitPlatformSupportImpl.
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index a32cc89..a900c41 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -28,13 +28,13 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/webkit_glue.h"
 
-using WebKit::WebFrame;
-using WebKit::WebInputEvent;
-using WebKit::WebMouseEvent;
-using WebKit::WebScriptController;
-using WebKit::WebScriptSource;
-using WebKit::WebString;
-using WebKit::WebURLRequest;
+using blink::WebFrame;
+using blink::WebInputEvent;
+using blink::WebMouseEvent;
+using blink::WebScriptController;
+using blink::WebScriptSource;
+using blink::WebString;
+using blink::WebURLRequest;
 
 namespace {
 const int32 kOpenerId = -2;
@@ -50,7 +50,7 @@ namespace content {
 class RendererWebKitPlatformSupportImplNoSandboxImpl
     : public RendererWebKitPlatformSupportImpl {
  public:
-  virtual WebKit::WebSandboxSupport* sandboxSupport() {
+  virtual blink::WebSandboxSupport* sandboxSupport() {
     return NULL;
   }
 };
@@ -65,7 +65,7 @@ RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::
     ~RendererWebKitPlatformSupportImplNoSandbox() {
 }
 
-WebKit::Platform*
+blink::Platform*
     RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::Get() {
   return webkit_platform_support_.get();
 }
@@ -117,11 +117,11 @@ void RenderViewTest::LoadHTML(const char* html) {
   ProcessPendingMessages();
 }
 
-void RenderViewTest::GoBack(const WebKit::WebHistoryItem& item) {
+void RenderViewTest::GoBack(const blink::WebHistoryItem& item) {
   GoToOffset(-1, item);
 }
 
-void RenderViewTest::GoForward(const WebKit::WebHistoryItem& item) {
+void RenderViewTest::GoForward(const blink::WebHistoryItem& item) {
   GoToOffset(1, item);
 }
 
@@ -149,7 +149,7 @@ void RenderViewTest::SetUp() {
   // Setting flags and really doing anything with WebKit is fairly fragile and
   // hacky, but this is the world we live in...
   webkit_glue::SetJavaScriptFlags(" --expose-gc");
-  WebKit::initialize(webkit_platform_support_.Get());
+  blink::initialize(webkit_platform_support_.Get());
 
   // Ensure that we register any necessary schemes when initializing WebKit,
   // since we are using a MockRenderThread.
@@ -178,7 +178,7 @@ void RenderViewTest::SetUp() {
       false, // swapped_out
       false, // hidden
       1, // next_page_id
-      WebKit::WebScreenInfo(),
+      blink::WebScreenInfo(),
       AccessibilityModeOff,
       true);
   view->AddRef();
@@ -207,7 +207,7 @@ void RenderViewTest::TearDown() {
   // (http://crbug.com/21508).
   base::RunLoop().RunUntilIdle();
 
-  WebKit::shutdown();
+  blink::shutdown();
 
   platform_->PlatformUninitialize();
   platform_.reset();
@@ -221,14 +221,14 @@ void RenderViewTest::SendNativeKeyEvent(
 }
 
 void RenderViewTest::SendWebKeyboardEvent(
-    const WebKit::WebKeyboardEvent& key_event) {
+    const blink::WebKeyboardEvent& key_event) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->OnMessageReceived(
       InputMsg_HandleInputEvent(0, &key_event, ui::LatencyInfo(), false));
 }
 
 void RenderViewTest::SendWebMouseEvent(
-    const WebKit::WebMouseEvent& mouse_event) {
+    const blink::WebMouseEvent& mouse_event) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->OnMessageReceived(
       InputMsg_HandleInputEvent(0, &mouse_event, ui::LatencyInfo(), false));
@@ -296,7 +296,7 @@ bool RenderViewTest::SimulateElementClick(const std::string& element_id) {
   return true;
 }
 
-void RenderViewTest::SetFocused(const WebKit::WebNode& node) {
+void RenderViewTest::SetFocused(const blink::WebNode& node) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->focusedNodeChanged(node);
 }
@@ -325,7 +325,7 @@ void RenderViewTest::Resize(gfx::Size new_size,
                             gfx::Rect resizer_rect,
                             bool is_fullscreen) {
   ViewMsg_Resize_Params params;
-  params.screen_info = WebKit::WebScreenInfo();
+  params.screen_info = blink::WebScreenInfo();
   params.new_size = new_size;
   params.physical_backing_size = new_size;
   params.overdraw_bottom_height = 0.f;
@@ -340,7 +340,7 @@ bool RenderViewTest::OnMessageReceived(const IPC::Message& msg) {
   return impl->OnMessageReceived(msg);
 }
 
-void RenderViewTest::DidNavigateWithinPage(WebKit::WebFrame* frame,
+void RenderViewTest::DidNavigateWithinPage(blink::WebFrame* frame,
                                            bool is_new_navigation) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->didNavigateWithinPage(frame, is_new_navigation);
@@ -351,13 +351,13 @@ void RenderViewTest::SendContentStateImmediately() {
   impl->set_send_content_state_immediately(true);
 }
 
-WebKit::WebWidget* RenderViewTest::GetWebWidget() {
+blink::WebWidget* RenderViewTest::GetWebWidget() {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   return impl->webwidget();
 }
 
 void RenderViewTest::GoToOffset(int offset,
-                                const WebKit::WebHistoryItem& history_item) {
+                                const blink::WebHistoryItem& history_item) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
 
   int history_list_length = impl->historyBackListCount() +
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index 1ae647c..6a5c2a1 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -19,7 +19,7 @@
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 
-namespace WebKit {
+namespace blink {
 class WebHistoryItem;
 class WebWidget;
 }
@@ -41,7 +41,7 @@ class RenderViewTest : public testing::Test {
    public:
     RendererWebKitPlatformSupportImplNoSandbox();
     ~RendererWebKitPlatformSupportImplNoSandbox();
-    WebKit::Platform* Get();
+    blink::Platform* Get();
 
    private:
     scoped_ptr<RendererWebKitPlatformSupportImplNoSandboxImpl>
@@ -56,7 +56,7 @@ class RenderViewTest : public testing::Test {
   void ProcessPendingMessages();
 
   // Returns a pointer to the main frame.
-  WebKit::WebFrame* GetMainFrame();
+  blink::WebFrame* GetMainFrame();
 
   // Executes the given JavaScript in the context of the main frame. The input
   // is a NULL-terminated UTF-8 string.
@@ -75,17 +75,17 @@ class RenderViewTest : public testing::Test {
   // Navigates the main frame back or forward in session history and commits.
   // The caller must capture a WebHistoryItem for the target page. This is
   // available from the WebFrame.
-  void GoBack(const WebKit::WebHistoryItem& item);
-  void GoForward(const WebKit::WebHistoryItem& item);
+  void GoBack(const blink::WebHistoryItem& item);
+  void GoForward(const blink::WebHistoryItem& item);
 
   // Sends one native key event over IPC.
   void SendNativeKeyEvent(const NativeWebKeyboardEvent& key_event);
 
   // Send a raw keyboard event to the renderer.
-  void SendWebKeyboardEvent(const WebKit::WebKeyboardEvent& key_event);
+  void SendWebKeyboardEvent(const blink::WebKeyboardEvent& key_event);
 
   // Send a raw mouse event to the renderer.
-  void SendWebMouseEvent(const WebKit::WebMouseEvent& key_event);
+  void SendWebMouseEvent(const blink::WebMouseEvent& key_event);
 
   // Returns the bounds (coordinates and size) of the element with id
   // |element_id|.  Returns an empty rect if such an element was not found.
@@ -97,7 +97,7 @@ class RenderViewTest : public testing::Test {
   bool SimulateElementClick(const std::string& element_id);
 
   // Simulates |node| being focused.
-  void SetFocused(const WebKit::WebNode& node);
+  void SetFocused(const blink::WebNode& node);
 
   // Clears anything associated with the browsing history.
   void ClearHistory();
@@ -115,9 +115,9 @@ class RenderViewTest : public testing::Test {
 
   // These are all methods from RenderViewImpl that we expose to testing code.
   bool OnMessageReceived(const IPC::Message& msg);
-  void DidNavigateWithinPage(WebKit::WebFrame* frame, bool is_new_navigation);
+  void DidNavigateWithinPage(blink::WebFrame* frame, bool is_new_navigation);
   void SendContentStateImmediately();
-  WebKit::WebWidget* GetWebWidget();
+  blink::WebWidget* GetWebWidget();
 
   // testing::Test
   virtual void SetUp() OVERRIDE;
@@ -139,7 +139,7 @@ class RenderViewTest : public testing::Test {
   scoped_ptr<CommandLine> command_line_;
 
  private:
-  void GoToOffset(int offset, const WebKit::WebHistoryItem& history_item);
+  void GoToOffset(int offset, const blink::WebHistoryItem& history_item);
 };
 
 }  // namespace content
diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc
index 47d61f6..ce3bb80 100644
--- a/content/public/test/render_widget_test.cc
+++ b/content/public/test/render_widget_test.cc
@@ -78,7 +78,7 @@ void RenderWidgetTest::TestResizeAndPaint() {
       "<html><body><div style='position: absolute; top: %d; left: "
       "%d; background-color: red;'>Hello World</div></body></html>",
       kTextPositionY, kTextPositionX).c_str());
-  WebKit::WebSize old_size = view_->GetWebView()->size();
+  blink::WebSize old_size = view_->GetWebView()->size();
 
   SkBitmap bitmap;
   // If we re-size the view to something smaller than where the 'Hello World'
@@ -154,7 +154,7 @@ void RenderWidgetTest::TestOnResize() {
   // The initial bounds is empty, so setting it to the same thing should do
   // nothing.
   ViewMsg_Resize_Params resize_params;
-  resize_params.screen_info = WebKit::WebScreenInfo();
+  resize_params.screen_info = blink::WebScreenInfo();
   resize_params.new_size = gfx::Size();
   resize_params.physical_backing_size = gfx::Size();
   resize_params.overdraw_bottom_height = 0.f;
diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc
index a8d5a25..934eb44 100644
--- a/content/public/test/unittest_test_suite.cc
+++ b/content/public/test/unittest_test_suite.cc
@@ -15,7 +15,7 @@ namespace content {
 #if !defined(OS_IOS)
 // A stubbed out WebKit platform support impl.
 class UnitTestTestSuite::UnitTestWebKitPlatformSupport
-    : public WebKit::Platform {
+    : public blink::Platform {
  public:
   UnitTestWebKitPlatformSupport() {}
   virtual ~UnitTestWebKitPlatformSupport() {}
@@ -37,13 +37,13 @@ UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
   DCHECK(test_suite);
 #if !defined(OS_IOS)
   webkit_platform_support_.reset(new UnitTestWebKitPlatformSupport);
-  WebKit::initialize(webkit_platform_support_.get());
+  blink::initialize(webkit_platform_support_.get());
 #endif
 }
 
 UnitTestTestSuite::~UnitTestTestSuite() {
 #if !defined(OS_IOS)
-  WebKit::shutdown();
+  blink::shutdown();
 #endif
 }