[Device Service] Move Gamepad Blink headers to be part of the Gamepad client library

device/gamepad/raw_input_data_fetcher_win.cc

Index: device/gamepad/raw_input_data_fetcher_win.cc
diff --git a/device/gamepad/raw_input_data_fetcher_win.cc b/device/gamepad/raw_input_data_fetcher_win.cc
index 27cc164fb9d11b224d6a06e263d5c4c93f691d49..132e93e22da33f448d3a0e63dcdc7251c09dd66e 100644
--- a/device/gamepad/raw_input_data_fetcher_win.cc
+++ b/device/gamepad/raw_input_data_fetcher_win.cc
@@ -12,8 +12,6 @@
 
 namespace device {
 
-using namespace blink;
-
 namespace {
 
 float NormalizeAxis(long value, long min, long max) {
@@ -160,7 +158,7 @@ void RawInputDataFetcher::GetGamepadData(bool devices_changed_hint) {
     if (!state)
       continue;
 
-    WebGamepad& pad = state->data;
+    Gamepad& pad = state->data;
 
     pad.timestamp = gamepad->report_id;
     pad.buttons_length = gamepad->buttons_length;
@@ -216,7 +214,7 @@ void RawInputDataFetcher::EnumerateDevices() {
 
         controllers_[device_handle] = gamepad;
 
-        WebGamepad& pad = state->data;
+        Gamepad& pad = state->data;
         pad.connected = true;
 
         std::string vendor = base::StringPrintf("%04x", gamepad->vendor_id);
@@ -225,13 +223,13 @@ void RawInputDataFetcher::EnumerateDevices() {
         state->axis_mask = 0;
         state->button_mask = 0;
 
-        swprintf(pad.id, WebGamepad::kIdLengthCap,
+        swprintf(pad.id, Gamepad::kIdLengthCap,
                  L"%ls (%lsVendor: %04x Product: %04x)", gamepad->id,
                  state->mapper ? L"STANDARD GAMEPAD " : L"", gamepad->vendor_id,
                  gamepad->product_id);
 
         if (state->mapper)
-          swprintf(pad.mapping, WebGamepad::kMappingLengthCap, L"standard");
+          swprintf(pad.mapping, Gamepad::kMappingLengthCap, L"standard");
         else
           pad.mapping[0] = 0;
       }
@@ -336,7 +334,7 @@ RawGamepadInfo* RawInputDataFetcher::ParseGamepadInfo(HANDLE hDevice) {
   }
 
   if (!got_product_string)
-    swprintf(gamepad_info->id, WebGamepad::kIdLengthCap, L"Unknown Gamepad");
+    swprintf(gamepad_info->id, Gamepad::kIdLengthCap, L"Unknown Gamepad");
 
   // Query device capabilities.
   result = GetRawInputDeviceInfo(hDevice, RIDI_PREPARSEDDATA, NULL, &size);
@@ -371,10 +369,10 @@ RawGamepadInfo* RawInputDataFetcher::ParseGamepadInfo(HANDLE hDevice) {
     DCHECK_EQ(HIDP_STATUS_SUCCESS, status);
 
     for (uint32_t i = 0; i < count; ++i) {
-      if (button_caps[i].Range.UsageMin <= WebGamepad::kButtonsLengthCap &&
+      if (button_caps[i].Range.UsageMin <= Gamepad::kButtonsLengthCap &&
           button_caps[i].UsagePage == kButtonUsagePage) {
         uint32_t max_index =
-            std::min(WebGamepad::kButtonsLengthCap,
+            std::min(Gamepad::kButtonsLengthCap,
                      static_cast<size_t>(button_caps[i].Range.UsageMax));
         gamepad_info->buttons_length =
             std::max(gamepad_info->buttons_length, max_index);
@@ -392,7 +390,7 @@ RawGamepadInfo* RawInputDataFetcher::ParseGamepadInfo(HANDLE hDevice) {
 
   for (UINT i = 0; i < count; i++) {
     uint32_t axis_index = axes_caps[i].Range.UsageMin - kAxisMinimumUsageNumber;
-    if (axis_index < WebGamepad::kAxesLengthCap) {
+    if (axis_index < Gamepad::kAxesLengthCap) {
       gamepad_info->axes[axis_index].caps = axes_caps[i];
       gamepad_info->axes[axis_index].value = 0;
       gamepad_info->axes[axis_index].active = true;
@@ -409,13 +407,13 @@ RawGamepadInfo* RawInputDataFetcher::ParseGamepadInfo(HANDLE hDevice) {
     uint32_t next_index = 0;
     for (UINT i = 0; i < count; i++) {
       uint32_t usage = axes_caps[i].Range.UsageMin - kAxisMinimumUsageNumber;
-      if (usage >= WebGamepad::kAxesLengthCap &&
+      if (usage >= Gamepad::kAxesLengthCap &&
           axes_caps[i].UsagePage <= kGameControlsUsagePage) {
-        for (; next_index < WebGamepad::kAxesLengthCap; ++next_index) {
+        for (; next_index < Gamepad::kAxesLengthCap; ++next_index) {
           if (!gamepad_info->axes[next_index].active)
             break;
         }
-        if (next_index < WebGamepad::kAxesLengthCap) {
+        if (next_index < Gamepad::kAxesLengthCap) {
           gamepad_info->axes[next_index].caps = axes_caps[i];
           gamepad_info->axes[next_index].value = 0;
           gamepad_info->axes[next_index].active = true;
@@ -426,7 +424,7 @@ RawGamepadInfo* RawInputDataFetcher::ParseGamepadInfo(HANDLE hDevice) {
         }
       }
 
-      if (next_index >= WebGamepad::kAxesLengthCap)
+      if (next_index >= Gamepad::kAxesLengthCap)
         break;
     }
   }
@@ -468,8 +466,7 @@ void RawInputDataFetcher::UpdateGamepad(RAWINPUT* input,
       for (uint32_t j = 0; j < buttons_length; j++) {
         int32_t button_index = usages[j].Usage - 1;
         if (usages[j].UsagePage == kButtonUsagePage && button_index >= 0 &&
-            button_index <
-                static_cast<int>(blink::WebGamepad::kButtonsLengthCap)) {
+            button_index < static_cast<int>(Gamepad::kButtonsLengthCap)) {
           gamepad_info->buttons[button_index] = true;
         }
       }