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

17 files changed, 78 insertions, 78 deletions

diff --git a/content/browser/gamepad/gamepad_data_fetcher.h b/content/browser/gamepad/gamepad_data_fetcher.h
index e5e009d..17887d5 100644
--- a/content/browser/gamepad/gamepad_data_fetcher.h
+++ b/content/browser/gamepad/gamepad_data_fetcher.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
 #define CONTENT_BROWSER_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
 
-namespace WebKit {
+namespace blink {
 class WebGamepads;
 }
 
@@ -16,7 +16,7 @@ namespace content {
 class GamepadDataFetcher {
  public:
   virtual ~GamepadDataFetcher() {}
-  virtual void GetGamepadData(WebKit::WebGamepads* pads,
+  virtual void GetGamepadData(blink::WebGamepads* pads,
                               bool devices_changed_hint) = 0;
   virtual void PauseHint(bool paused) {}
 };
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher.cc b/content/browser/gamepad/gamepad_platform_data_fetcher.cc
index b4499d6..d889526 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher.cc
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher.cc
@@ -11,7 +11,7 @@ namespace content {
 GamepadDataFetcherEmpty::GamepadDataFetcherEmpty() {
 }
 
-void GamepadDataFetcherEmpty::GetGamepadData(WebKit::WebGamepads* pads,
+void GamepadDataFetcherEmpty::GetGamepadData(blink::WebGamepads* pads,
                                              bool devices_changed_hint) {
   pads->length = 0;
 }
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher.h b/content/browser/gamepad/gamepad_platform_data_fetcher.h
index f073a53..625e72c 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher.h
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher.h
@@ -40,7 +40,7 @@ class GamepadDataFetcherEmpty : public GamepadDataFetcher {
  public:
   GamepadDataFetcherEmpty();
 
-  virtual void GetGamepadData(WebKit::WebGamepads* pads,
+  virtual void GetGamepadData(blink::WebGamepads* pads,
                               bool devices_changed_hint) OVERRIDE;
 
  private:
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc
index c82997e..ba048ae 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc
@@ -52,7 +52,7 @@ bool IsGamepad(udev_device* dev, int* index, std::string* path) {
   if (!base::StringToInt(str, &tmp_idx))
     return false;
   if (tmp_idx < 0 ||
-      tmp_idx >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) {
+      tmp_idx >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) {
     return false;
   }
   *index = tmp_idx;
@@ -64,8 +64,8 @@ bool IsGamepad(udev_device* dev, int* index, std::string* path) {
 
 namespace content {
 
-using WebKit::WebGamepad;
-using WebKit::WebGamepads;
+using blink::WebGamepad;
+using blink::WebGamepads;
 
 GamepadPlatformDataFetcherLinux::GamepadPlatformDataFetcherLinux() {
   for (size_t i = 0; i < arraysize(device_fds_); ++i)
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h
index 916eda3..f95e52f 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h
@@ -28,7 +28,7 @@ class GamepadPlatformDataFetcherLinux : public GamepadDataFetcher {
   virtual ~GamepadPlatformDataFetcherLinux();
 
   // GamepadDataFetcher implementation.
-  virtual void GetGamepadData(WebKit::WebGamepads* pads,
+  virtual void GetGamepadData(blink::WebGamepads* pads,
                               bool devices_changed_hint) OVERRIDE;
 
  private:
@@ -37,14 +37,14 @@ class GamepadPlatformDataFetcherLinux : public GamepadDataFetcher {
   void ReadDeviceData(size_t index);
 
   // File descriptors for the /dev/input/js* devices. -1 if not in use.
-  int device_fds_[WebKit::WebGamepads::itemsLengthCap];
+  int device_fds_[blink::WebGamepads::itemsLengthCap];
 
   // Functions to map from device data to standard layout, if available. May
   // be null if no mapping is available.
-  GamepadStandardMappingFunction mappers_[WebKit::WebGamepads::itemsLengthCap];
+  GamepadStandardMappingFunction mappers_[blink::WebGamepads::itemsLengthCap];
 
   // Data that's returned to the consumer.
-  WebKit::WebGamepads data_;
+  blink::WebGamepads data_;
 
   scoped_ptr<UdevLinux> udev_;
 
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h
index 3b22b693..54e1944 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h
@@ -32,7 +32,7 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher,
  public:
   GamepadPlatformDataFetcherMac();
   virtual ~GamepadPlatformDataFetcherMac();
-  virtual void GetGamepadData(WebKit::WebGamepads* pads,
+  virtual void GetGamepadData(blink::WebGamepads* pads,
                               bool devices_changed_hint) OVERRIDE;
   virtual void PauseHint(bool paused) OVERRIDE;
 
@@ -73,7 +73,7 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher,
 
   scoped_ptr<XboxDataFetcher> xbox_fetcher_;
 
-  WebKit::WebGamepads data_;
+  blink::WebGamepads data_;
 
   // Side-band data that's not passed to the consumer, but we need to maintain
   // to update data_.
@@ -82,10 +82,10 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher,
     union {
       struct {
         IOHIDDeviceRef device_ref;
-        IOHIDElementRef button_elements[WebKit::WebGamepad::buttonsLengthCap];
-        IOHIDElementRef axis_elements[WebKit::WebGamepad::buttonsLengthCap];
-        CFIndex axis_minimums[WebKit::WebGamepad::axesLengthCap];
-        CFIndex axis_maximums[WebKit::WebGamepad::axesLengthCap];
+        IOHIDElementRef button_elements[blink::WebGamepad::buttonsLengthCap];
+        IOHIDElementRef axis_elements[blink::WebGamepad::buttonsLengthCap];
+        CFIndex axis_minimums[blink::WebGamepad::axesLengthCap];
+        CFIndex axis_maximums[blink::WebGamepad::axesLengthCap];
         // Function to map from device data to standard layout, if available.
         // May be null if no mapping is available.
         GamepadStandardMappingFunction mapper;
@@ -96,7 +96,7 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher,
       } xbox;
     };
   };
-  AssociatedData associated_[WebKit::WebGamepads::itemsLengthCap];
+  AssociatedData associated_[blink::WebGamepads::itemsLengthCap];
 
   DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherMac);
 };
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
index 8ed59ac..69d0c63 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
@@ -14,8 +14,8 @@
 #import <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDKeys.h>
 
-using WebKit::WebGamepad;
-using WebKit::WebGamepads;
+using blink::WebGamepad;
+using blink::WebGamepads;
 
 namespace content {
 
@@ -266,7 +266,7 @@ void GamepadPlatformDataFetcherMac::DeviceAdd(IOHIDDeviceRef device) {
   const size_t kOutputLengthBytes = sizeof(data_.items[slot].id);
   memset(&data_.items[slot].id, 0, kOutputLengthBytes);
   [as16 getBytes:data_.items[slot].id
-          length:kOutputLengthBytes - sizeof(WebKit::WebUChar)];
+          length:kOutputLengthBytes - sizeof(blink::WebUChar)];
 
   base::ScopedCFTypeRef<CFArrayRef> elements(
       IOHIDDeviceCopyMatchingElements(device, NULL, kIOHIDOptionsTypeNone));
@@ -359,7 +359,7 @@ void GamepadPlatformDataFetcherMac::XboxDeviceAdd(XboxController* device) {
   const size_t kOutputLengthBytes = sizeof(data_.items[slot].id);
   memset(&data_.items[slot].id, 0, kOutputLengthBytes);
   [as16 getBytes:data_.items[slot].id
-          length:kOutputLengthBytes - sizeof(WebKit::WebUChar)];
+          length:kOutputLengthBytes - sizeof(blink::WebUChar)];
 
   associated_[slot].is_xbox = true;
   associated_[slot].xbox.device = device;
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc
index 91ebdf5..757355c 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc
@@ -22,7 +22,7 @@
 
 namespace content {
 
-using namespace WebKit;
+using namespace blink;
 
 namespace {
 
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h b/content/browser/gamepad/gamepad_platform_data_fetcher_win.h
index 7551ee9..c894143 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_win.h
@@ -31,13 +31,13 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
  public:
   GamepadPlatformDataFetcherWin();
   virtual ~GamepadPlatformDataFetcherWin();
-  virtual void GetGamepadData(WebKit::WebGamepads* pads,
+  virtual void GetGamepadData(blink::WebGamepads* pads,
                               bool devices_changed_hint) OVERRIDE;
  private:
   // XInput-specific implementation for GetGamepadData.
-  bool GetXInputGamepadData(WebKit::WebGamepads* pads,
+  bool GetXInputGamepadData(blink::WebGamepads* pads,
                             bool devices_changed_hint);
-  bool GetDirectInputGamepadData(WebKit::WebGamepads* pads,
+  bool GetDirectInputGamepadData(blink::WebGamepads* pads,
                                  bool devices_changed_hint);
 
   // The three function types we use from xinput1_3.dll.
@@ -54,11 +54,11 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
   bool GetXInputDllFunctions();
 
   // Scan for connected XInput and DirectInput gamepads.
-  void EnumerateDevices(WebKit::WebGamepads* pads);
-  bool GetXInputPadConnectivity(int i, WebKit::WebGamepad* pad) const;
+  void EnumerateDevices(blink::WebGamepads* pads);
+  bool GetXInputPadConnectivity(int i, blink::WebGamepad* pad) const;
 
-  void GetXInputPadData(int i, WebKit::WebGamepad* pad);
-  void GetDirectInputPadData(int i, WebKit::WebGamepad* pad);
+  void GetXInputPadData(int i, blink::WebGamepad* pad);
+  void GetDirectInputPadData(int i, blink::WebGamepad* pad);
 
   int FirstAvailableGamepadId() const;
   bool HasXInputGamepad(int index) const;
@@ -90,7 +90,7 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
     IDirectInputDevice8* directinput_gamepad;
     GamepadStandardMappingFunction mapper;
   };
-  PadState pad_state_[WebKit::WebGamepads::itemsLengthCap];
+  PadState pad_state_[blink::WebGamepads::itemsLengthCap];
 
   DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherWin);
 };
diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc
index 7e8e6de..55a5f30 100644
--- a/content/browser/gamepad/gamepad_provider.cc
+++ b/content/browser/gamepad/gamepad_provider.cc
@@ -158,7 +158,7 @@ void GamepadProvider::DoPoll() {
 
   ANNOTATE_BENIGN_RACE_SIZED(
       &hwbuf->buffer,
-      sizeof(WebKit::WebGamepads),
+      sizeof(blink::WebGamepads),
       "Racey reads are discarded");
 
   {
diff --git a/content/browser/gamepad/gamepad_provider_unittest.cc b/content/browser/gamepad/gamepad_provider_unittest.cc
index 0e5785c..398edca 100644
--- a/content/browser/gamepad/gamepad_provider_unittest.cc
+++ b/content/browser/gamepad/gamepad_provider_unittest.cc
@@ -15,7 +15,7 @@ namespace content {
 
 namespace {
 
-using WebKit::WebGamepads;
+using blink::WebGamepads;
 
 // Helper class to generate and record user gesture callbacks.
 class UserGestureListener {
diff --git a/content/browser/gamepad/gamepad_standard_mappings.h b/content/browser/gamepad/gamepad_standard_mappings.h
index 6f5d72f..6b533ca 100644
--- a/content/browser/gamepad/gamepad_standard_mappings.h
+++ b/content/browser/gamepad/gamepad_standard_mappings.h
@@ -7,15 +7,15 @@
 
 #include "base/strings/string_piece.h"
 
-namespace WebKit {
+namespace blink {
 class WebGamepad;
 }
 
 namespace content {
 
 typedef void (*GamepadStandardMappingFunction)(
-    const WebKit::WebGamepad& original,
-    WebKit::WebGamepad* mapped);
+    const blink::WebGamepad& original,
+    blink::WebGamepad* mapped);
 
 GamepadStandardMappingFunction GetGamepadStandardMappingFunction(
     const base::StringPiece& vendor_id,
diff --git a/content/browser/gamepad/gamepad_standard_mappings_linux.cc b/content/browser/gamepad/gamepad_standard_mappings_linux.cc
index e9e7094..712e753 100644
--- a/content/browser/gamepad/gamepad_standard_mappings_linux.cc
+++ b/content/browser/gamepad/gamepad_standard_mappings_linux.cc
@@ -23,8 +23,8 @@ float AxisPositiveAsButton(float input) {
 }
 
 void MapperXInputStyleGamepad(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonLeftTrigger] = AxisToButton(input.axes[2]);
   mapped->buttons[kButtonRightTrigger] = AxisToButton(input.axes[5]);
@@ -44,8 +44,8 @@ void MapperXInputStyleGamepad(
 }
 
 void MapperLakeviewResearch(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonPrimary] = input.buttons[2];
   mapped->buttons[kButtonTertiary] = input.buttons[3];
@@ -65,8 +65,8 @@ void MapperLakeviewResearch(
 }
 
 void MapperPlaystationSixAxis(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonPrimary] = input.buttons[14];
   mapped->buttons[kButtonSecondary] = input.buttons[13];
@@ -91,8 +91,8 @@ void MapperPlaystationSixAxis(
 }
 
 void MapperXGEAR(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonPrimary] = input.buttons[2];
   mapped->buttons[kButtonSecondary] = input.buttons[1];
@@ -114,8 +114,8 @@ void MapperXGEAR(
 
 
 void MapperDragonRiseGeneric(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonDpadUp] = AxisNegativeAsButton(input.axes[6]);
   mapped->buttons[kButtonDpadDown] = AxisPositiveAsButton(input.axes[6]);
diff --git a/content/browser/gamepad/gamepad_standard_mappings_mac.mm b/content/browser/gamepad/gamepad_standard_mappings_mac.mm
index 0ffb35f..2696c53 100644
--- a/content/browser/gamepad/gamepad_standard_mappings_mac.mm
+++ b/content/browser/gamepad/gamepad_standard_mappings_mac.mm
@@ -14,7 +14,7 @@ float AxisToButton(float input) {
   return (input + 1.f) / 2.f;
 }
 
-void DpadFromAxis(WebKit::WebGamepad* mapped, float dir) {
+void DpadFromAxis(blink::WebGamepad* mapped, float dir) {
   // Dpad is mapped as a direction on one axis, where -1 is up and it
   // increases clockwise to 1, which is up + left. It's set to a large (> 1.f)
   // number when nothing is depressed, except on start up, sometimes it's 0.0
@@ -34,8 +34,8 @@ void DpadFromAxis(WebKit::WebGamepad* mapped, float dir) {
 }
 
 void MapperXbox360Gamepad(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonLeftTrigger] = AxisToButton(input.axes[2]);
   mapped->buttons[kButtonRightTrigger] = AxisToButton(input.axes[5]);
@@ -55,8 +55,8 @@ void MapperXbox360Gamepad(
 }
 
 void MapperPlaystationSixAxis(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonPrimary] = input.buttons[14];
   mapped->buttons[kButtonSecondary] = input.buttons[13];
@@ -82,8 +82,8 @@ void MapperPlaystationSixAxis(
 }
 
 void MapperDirectInputStyle(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonPrimary] = input.buttons[1];
   mapped->buttons[kButtonSecondary] = input.buttons[2];
@@ -95,8 +95,8 @@ void MapperDirectInputStyle(
 }
 
 void MapperMacallyIShock(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   enum IShockButtons {
     kButtonC = kNumButtons,
     kButtonD,
@@ -135,8 +135,8 @@ void MapperMacallyIShock(
 }
 
 void MapperXGEAR(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonPrimary] = input.buttons[2];
   mapped->buttons[kButtonTertiary] = input.buttons[3];
@@ -153,8 +153,8 @@ void MapperXGEAR(
 }
 
 void MapperSmartJoyPLUS(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonPrimary] = input.buttons[2];
   mapped->buttons[kButtonTertiary] = input.buttons[3];
@@ -172,8 +172,8 @@ void MapperSmartJoyPLUS(
 }
 
 void MapperDragonRiseGeneric(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   DpadFromAxis(mapped, input.axes[9]);
   mapped->axes[kAxisLeftStickX] = input.axes[0];
diff --git a/content/browser/gamepad/gamepad_standard_mappings_win.cc b/content/browser/gamepad/gamepad_standard_mappings_win.cc
index fa57c03..07adb9b 100644
--- a/content/browser/gamepad/gamepad_standard_mappings_win.cc
+++ b/content/browser/gamepad/gamepad_standard_mappings_win.cc
@@ -24,8 +24,8 @@ float AxisPositiveAsButton(long value) {
 }
 
 void MapperDragonRiseGeneric(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[0] = input.buttons[1];
   mapped->buttons[1] = input.buttons[2];
@@ -43,8 +43,8 @@ void MapperDragonRiseGeneric(
 }
 
 void MapperLogitechDualAction(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[0] = input.buttons[1];
   mapped->buttons[1] = input.buttons[2];
@@ -62,8 +62,8 @@ void MapperLogitechDualAction(
 }
 
 void MapperLogitechPrecision(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[0] = input.buttons[1];
   mapped->buttons[1] = input.buttons[2];
@@ -79,8 +79,8 @@ void MapperLogitechPrecision(
 }
 
 void Mapper2Axes8Keys(
-    const WebKit::WebGamepad& input,
-    WebKit::WebGamepad* mapped) {
+    const blink::WebGamepad& input,
+    blink::WebGamepad* mapped) {
   *mapped = input;
   mapped->buttons[kButtonLeftTrigger] = 0;  // Not present
   mapped->buttons[kButtonRightTrigger] = 0;  // Not present
diff --git a/content/browser/gamepad/gamepad_test_helpers.cc b/content/browser/gamepad/gamepad_test_helpers.cc
index e4db14c..8837c8e 100644
--- a/content/browser/gamepad/gamepad_test_helpers.cc
+++ b/content/browser/gamepad/gamepad_test_helpers.cc
@@ -9,7 +9,7 @@
 namespace content {
 
 MockGamepadDataFetcher::MockGamepadDataFetcher(
-    const WebKit::WebGamepads& test_data)
+    const blink::WebGamepads& test_data)
     : test_data_(test_data),
       read_data_(false, false) {
 }
@@ -17,7 +17,7 @@ MockGamepadDataFetcher::MockGamepadDataFetcher(
 MockGamepadDataFetcher::~MockGamepadDataFetcher() {
 }
 
-void MockGamepadDataFetcher::GetGamepadData(WebKit::WebGamepads* pads,
+void MockGamepadDataFetcher::GetGamepadData(blink::WebGamepads* pads,
                                             bool devices_changed_hint) {
   {
     base::AutoLock lock(lock_);
@@ -30,7 +30,7 @@ void MockGamepadDataFetcher::WaitForDataRead() {
   return read_data_.Wait();
 }
 
-void MockGamepadDataFetcher::SetTestData(const WebKit::WebGamepads& new_data) {
+void MockGamepadDataFetcher::SetTestData(const blink::WebGamepads& new_data) {
   base::AutoLock lock(lock_);
   test_data_ = new_data;
 }
@@ -42,7 +42,7 @@ GamepadTestHelper::~GamepadTestHelper() {
 }
 
 GamepadServiceTestConstructor::GamepadServiceTestConstructor(
-    const WebKit::WebGamepads& test_data) {
+    const blink::WebGamepads& test_data) {
   data_fetcher_ = new MockGamepadDataFetcher(test_data);
   gamepad_service_ =
       new GamepadService(scoped_ptr<GamepadDataFetcher>(data_fetcher_));
diff --git a/content/browser/gamepad/gamepad_test_helpers.h b/content/browser/gamepad/gamepad_test_helpers.h
index 3b43f77..2aad5753 100644
--- a/content/browser/gamepad/gamepad_test_helpers.h
+++ b/content/browser/gamepad/gamepad_test_helpers.h
@@ -21,12 +21,12 @@ class MockGamepadDataFetcher : public GamepadDataFetcher {
  public:
   // Initializes the fetcher with the given gamepad data, which will be
   // returned when the provider queries us.
-  explicit MockGamepadDataFetcher(const WebKit::WebGamepads& test_data);
+  explicit MockGamepadDataFetcher(const blink::WebGamepads& test_data);
 
   virtual ~MockGamepadDataFetcher();
 
   // GamepadDataFetcher.
-  virtual void GetGamepadData(WebKit::WebGamepads* pads,
+  virtual void GetGamepadData(blink::WebGamepads* pads,
                               bool devices_changed_hint) OVERRIDE;
 
   // Blocks the current thread until the GamepadProvider reads from this
@@ -34,11 +34,11 @@ class MockGamepadDataFetcher : public GamepadDataFetcher {
   void WaitForDataRead();
 
   // Updates the test data.
-  void SetTestData(const WebKit::WebGamepads& new_data);
+  void SetTestData(const blink::WebGamepads& new_data);
 
  private:
   base::Lock lock_;
-  WebKit::WebGamepads test_data_;
+  blink::WebGamepads test_data_;
   base::WaitableEvent read_data_;
 
   DISALLOW_COPY_AND_ASSIGN(MockGamepadDataFetcher);
@@ -63,7 +63,7 @@ class GamepadTestHelper {
 // global singleton for the gamepad service.
 class GamepadServiceTestConstructor : public GamepadTestHelper {
  public:
-  explicit GamepadServiceTestConstructor(const WebKit::WebGamepads& test_data);
+  explicit GamepadServiceTestConstructor(const blink::WebGamepads& test_data);
   virtual ~GamepadServiceTestConstructor();
 
   GamepadService* gamepad_service() { return gamepad_service_; }