Renderer reading side of gamepad

content/browser/gamepad/data_fetcher_win.cc

Index: content/browser/gamepad/data_fetcher_win.cc
diff --git a/content/browser/gamepad/data_fetcher_win.cc b/content/browser/gamepad/data_fetcher_win.cc
index edd76a735b89780d1d43a16756f827d23bc93b4f..b823f2736f1ca42b7ec045c3f314af138319ddb6 100644
--- a/content/browser/gamepad/data_fetcher_win.cc
+++ b/content/browser/gamepad/data_fetcher_win.cc
@@ -13,7 +13,7 @@
 #pragma comment(lib, "delayimp.lib")
 #pragma comment(lib, "xinput.lib")
 
-namespace gamepad {
+namespace content {
 
 using namespace WebKit;
 
@@ -78,13 +78,13 @@ bool EnableXInput() {
 
 }
 
-DataFetcherWindows::DataFetcherWindows()
+GamepadDataFetcherWindows::GamepadDataFetcherWindows()
     : xinput_available_(EnableXInput()) {
 }
 
-void DataFetcherWindows::GetGamepadData(WebGamepads* pads,
+void GamepadDataFetcherWindows::GetGamepadData(WebGamepads* pads,
                                         bool devices_changed_hint) {
-  TRACE_EVENT0("GAMEPAD", "DataFetcherWindows::GetGamepadData");
+  TRACE_EVENT0("GAMEPAD", "GetGamepadData");
 
   // If there's no XInput DLL on the system, early out so that we don't
   // call any other XInput functions.
@@ -104,7 +104,7 @@ void DataFetcherWindows::GetGamepadData(WebGamepads* pads,
   if (devices_changed_hint) {
     for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
       WebGamepad& pad = pads->items[i];
-      TRACE_EVENT1("GAMEPAD", "DataFetcherWindows::GetCapabilities", "id", i);
+      TRACE_EVENT1("GAMEPAD", "GetCapabilities", "id", i);
       XINPUT_CAPABILITIES caps;
       DWORD res = XInputGetCapabilities(i, XINPUT_FLAG_GAMEPAD, &caps);
       if (res == ERROR_DEVICE_NOT_CONNECTED) {
@@ -170,4 +170,4 @@ void DataFetcherWindows::GetGamepadData(WebGamepads* pads,
   }
 }
 
-} // namespace gamepad
+} // namespace content