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

device/vr/android/gvr/gvr_gamepad_data_fetcher.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/vr/android/gvr/gvr_gamepad_data_fetcher.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "device/gamepad/public/cpp/gamepads.h"
 #include "device/vr/android/gvr/gvr_gamepad_data_provider.h"
 #include "device/vr/vr_types.h"
-#include "third_party/WebKit/public/platform/WebGamepads.h"
 
 namespace device {
 
 namespace {
 
-void CopyToWebUString(blink::WebUChar* dest,
-                      size_t dest_length,
-                      base::string16 src) {
-  static_assert(sizeof(base::string16::value_type) == sizeof(blink::WebUChar),
+void CopyToUString(UChar* dest, size_t dest_length, base::string16 src) {
+  static_assert(sizeof(base::string16::value_type) == sizeof(UChar),
                 "Mismatched string16/WebUChar size.");
 
   const size_t str_to_copy = std::min(src.size(), dest_length - 1);
   memcpy(dest, src.data(), str_to_copy * sizeof(base::string16::value_type));
   dest[str_to_copy] = 0;
 }
 
 }  // namespace
 
-using namespace blink;
-
 GvrGamepadDataFetcher::Factory::Factory(GvrGamepadDataProvider* data_provider,
                                         unsigned int display_id)
     : data_provider_(data_provider), display_id_(display_id) {
   DVLOG(1) << __FUNCTION__ << "=" << this;
 }
 
 GvrGamepadDataFetcher::Factory::~Factory() {
   DVLOG(1) << __FUNCTION__ << "=" << this;
 }
 
@@ skipping 36 matching lines @@
   // Called from gamepad polling thread.
 
   PadState* state = GetPadState(0);
   if (!state)
     return;
 
   // Take a snapshot of the asynchronously updated gamepad data.
   // TODO(bajones): ensure consistency?
   GvrGamepadData provided_data = gamepad_data_;
 
-  WebGamepad& pad = state->data;
+  Gamepad& pad = state->data;
   if (state->active_state == GAMEPAD_NEWLY_ACTIVE) {
     // This is the first time we've seen this device, so do some one-time
     // initialization
     pad.connected = true;
-    CopyToWebUString(pad.id, WebGamepad::kIdLengthCap,
-                     base::UTF8ToUTF16("Daydream Controller"));
-    CopyToWebUString(pad.mapping, WebGamepad::kMappingLengthCap,
-                     base::UTF8ToUTF16(""));
+    CopyToUString(pad.id, Gamepad::kIdLengthCap,
+                  base::UTF8ToUTF16("Daydream Controller"));
+    CopyToUString(pad.mapping, Gamepad::kMappingLengthCap,
+                  base::UTF8ToUTF16(""));
     pad.buttons_length = 1;
     pad.axes_length = 2;
 
     pad.display_id = display_id_;
 
     pad.hand =
-        provided_data.right_handed ? kGamepadHandRight : kGamepadHandLeft;
+        provided_data.right_handed ? GamepadHand::kRight : GamepadHand::kLeft;
   }
 
   pad.timestamp = provided_data.timestamp;
 
   if (provided_data.is_touching) {
     gfx::Vector2dF touch_position = provided_data.touch_pos;
     pad.axes[0] = (touch_position.x() * 2.0f) - 1.0f;
     pad.axes[1] = (touch_position.y() * 2.0f) - 1.0f;
   } else {
     pad.axes[0] = 0.0f;
@@ skipping 24 matching lines @@
   gfx::Vector3dF gyro = provided_data.gyro;
   pad.pose.angular_velocity.not_null = true;
   pad.pose.angular_velocity.x = gyro.x();
   pad.pose.angular_velocity.y = gyro.y();
   pad.pose.angular_velocity.z = gyro.z();
 }
 
 void GvrGamepadDataFetcher::PauseHint(bool paused) {}
 
 }  // namespace device