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

device/gamepad/gamepad_service_unittest.cc

 // Copyright 2014 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/gamepad/gamepad_service.h"
 
 #include <string.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "device/gamepad/gamepad_consumer.h"
 #include "device/gamepad/gamepad_test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace device {
 
 namespace {
-static const int kNumberOfGamepads = blink::WebGamepads::kItemsLengthCap;
+static const int kNumberOfGamepads = Gamepads::kItemsLengthCap;
 }
 
-using blink::WebGamepads;
-
 class ConnectionListener : public device::GamepadConsumer {
  public:
   ConnectionListener() { ClearCounters(); }
 
-  void OnGamepadConnected(unsigned index,
-                          const blink::WebGamepad& gamepad) override {
+  void OnGamepadConnected(unsigned index, const Gamepad& gamepad) override {
     connected_counter_++;
   }
-  void OnGamepadDisconnected(unsigned index,
-                             const blink::WebGamepad& gamepad) override {
+  void OnGamepadDisconnected(unsigned index, const Gamepad& gamepad) override {
     disconnected_counter_++;
   }
 
   void ClearCounters() {
     connected_counter_ = 0;
     disconnected_counter_ = 0;
   }
 
   int connected_counter() const { return connected_counter_; }
   int disconnected_counter() const { return disconnected_counter_; }
@@ skipping 18 matching lines @@
     return connection_listener_->disconnected_counter();
   }
 
   void SetUp() override;
 
  private:
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   device::MockGamepadDataFetcher* fetcher_;
   GamepadService* service_;
   std::unique_ptr<ConnectionListener> connection_listener_;
-  WebGamepads test_data_;
+  Gamepads test_data_;
 
   DISALLOW_COPY_AND_ASSIGN(GamepadServiceTest);
 };
 
 GamepadServiceTest::GamepadServiceTest() {
   memset(&test_data_, 0, sizeof(test_data_));
 
   // Set it so that we have user gesture.
   test_data_.items[0].buttons_length = 1;
   test_data_.items[0].buttons[0].value = 1.f;
@@ skipping 40 matching lines @@
   WaitForData();
   EXPECT_EQ(0, GetConnectedCounter());
   EXPECT_EQ(kNumberOfGamepads, GetDisconnectedCounter());
 
   WaitForData();
   EXPECT_EQ(0, GetConnectedCounter());
   EXPECT_EQ(0, GetDisconnectedCounter());
 }
 
 }  // namespace device