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

content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <memory>
@@ skipping 16 matching lines @@
 namespace content {
 
 namespace {
 
 class PepperGamepadHostTest : public testing::Test,
                               public BrowserPpapiHostTest {
  public:
   PepperGamepadHostTest() {}
   ~PepperGamepadHostTest() override {}
 
-  void ConstructService(const blink::WebGamepads& test_data) {
+  void ConstructService(const device::Gamepads& test_data) {
     service_.reset(new device::GamepadServiceTestConstructor(test_data));
   }
 
   device::GamepadService* gamepad_service() {
     return service_->gamepad_service();
   }
 
  protected:
   std::unique_ptr<device::GamepadServiceTestConstructor> service_;
 
@@ skipping 17 matching lines @@
   ppapi::ContentGamepadHardwareBuffer ppapi_buf;
   device::GamepadHardwareBuffer content_buf;
   EXPECT_EQ(AddressDiff(&content_buf.seqlock, &content_buf),
             AddressDiff(&ppapi_buf.sequence, &ppapi_buf));
   EXPECT_EQ(AddressDiff(&content_buf.data, &content_buf),
             AddressDiff(&ppapi_buf.buffer, &ppapi_buf));
 }
 
 TEST_F(PepperGamepadHostTest, ValidateGamepadsMatch) {
   // Gamepads.
-  static_assert(sizeof(ppapi::WebKitGamepads) == sizeof(blink::WebGamepads),
+  static_assert(sizeof(ppapi::WebKitGamepads) == sizeof(device::Gamepads),
                 "gamepads data must match");
   ppapi::WebKitGamepads ppapi_gamepads;
-  blink::WebGamepads web_gamepads;
+  device::Gamepads web_gamepads;
 
   // See comment below on storage & the EXPECT macro.
-  size_t webkit_items_length_cap = blink::WebGamepads::kItemsLengthCap;
+  size_t webkit_items_length_cap = device::Gamepads::kItemsLengthCap;
   size_t ppapi_items_length_cap = ppapi::WebKitGamepads::kItemsLengthCap;
   EXPECT_EQ(webkit_items_length_cap, ppapi_items_length_cap);
 
   for (size_t i = 0; i < webkit_items_length_cap; i++) {
     EXPECT_EQ(AddressDiff(&web_gamepads.items[0], &web_gamepads),
               AddressDiff(&ppapi_gamepads.items[0], &ppapi_gamepads));
   }
 }
 
 TEST_F(PepperGamepadHostTest, ValidateGamepadMatch) {
   // Gamepad.
-  static_assert(sizeof(ppapi::WebKitGamepad) == sizeof(blink::WebGamepad),
+  static_assert(sizeof(ppapi::WebKitGamepad) == sizeof(device::Gamepad),
                 "gamepad data must match");
   ppapi::WebKitGamepad ppapi_gamepad;
-  blink::WebGamepad web_gamepad;
+  device::Gamepad web_gamepad;
 
   // Using EXPECT seems to force storage for the parameter, which the constants
   // in the WebKit/PPAPI headers don't have. So we have to use temporaries
   // before comparing them.
-  size_t webkit_id_length_cap = blink::WebGamepad::kIdLengthCap;
+  size_t webkit_id_length_cap = device::Gamepad::kIdLengthCap;
   size_t ppapi_id_length_cap = ppapi::WebKitGamepad::kIdLengthCap;
   EXPECT_EQ(webkit_id_length_cap, ppapi_id_length_cap);
 
-  size_t webkit_axes_length_cap = blink::WebGamepad::kAxesLengthCap;
+  size_t webkit_axes_length_cap = device::Gamepad::kAxesLengthCap;
   size_t ppapi_axes_length_cap = ppapi::WebKitGamepad::kAxesLengthCap;
   EXPECT_EQ(webkit_axes_length_cap, ppapi_axes_length_cap);
 
-  size_t webkit_buttons_length_cap = blink::WebGamepad::kButtonsLengthCap;
+  size_t webkit_buttons_length_cap = device::Gamepad::kButtonsLengthCap;
   size_t ppapi_buttons_length_cap = ppapi::WebKitGamepad::kButtonsLengthCap;
   EXPECT_EQ(webkit_buttons_length_cap, ppapi_buttons_length_cap);
 
   EXPECT_EQ(AddressDiff(&web_gamepad.connected, &web_gamepad),
             AddressDiff(&ppapi_gamepad.connected, &ppapi_gamepad));
   EXPECT_EQ(AddressDiff(&web_gamepad.id, &web_gamepad),
             AddressDiff(&ppapi_gamepad.id, &ppapi_gamepad));
   EXPECT_EQ(AddressDiff(&web_gamepad.timestamp, &web_gamepad),
             AddressDiff(&ppapi_gamepad.timestamp, &ppapi_gamepad));
   EXPECT_EQ(AddressDiff(&web_gamepad.axes_length, &web_gamepad),
             AddressDiff(&ppapi_gamepad.axes_length, &ppapi_gamepad));
   EXPECT_EQ(AddressDiff(&web_gamepad.axes, &web_gamepad),
             AddressDiff(&ppapi_gamepad.axes, &ppapi_gamepad));
   EXPECT_EQ(AddressDiff(&web_gamepad.buttons_length, &web_gamepad),
             AddressDiff(&ppapi_gamepad.buttons_length, &ppapi_gamepad));
   EXPECT_EQ(AddressDiff(&web_gamepad.buttons, &web_gamepad),
             AddressDiff(&ppapi_gamepad.buttons, &ppapi_gamepad));
 }
 
 TEST_F(PepperGamepadHostTest, WaitForReply) {
-  blink::WebGamepads default_data;
-  memset(&default_data, 0, sizeof(blink::WebGamepads));
+  device::Gamepads default_data;
+  memset(&default_data, 0, sizeof(device::Gamepads));
   default_data.items[0].connected = true;
   default_data.items[0].buttons_length = 1;
   ConstructService(default_data);
 
   PP_Instance pp_instance = 12345;
   PP_Resource pp_resource = 67890;
   PepperGamepadHost gamepad_host(
       gamepad_service(), GetBrowserPpapiHost(), pp_instance, pp_resource);
 
   // Synthesize a request for gamepad data.
   ppapi::host::HostMessageContext context(
       ppapi::proxy::ResourceMessageCallParams(pp_resource, 1));
   EXPECT_EQ(PP_OK_COMPLETIONPENDING,
             gamepad_host.OnResourceMessageReceived(
                 PpapiHostMsg_Gamepad_RequestMemory(), &context));
 
   device::MockGamepadDataFetcher* fetcher = service_->data_fetcher();
   fetcher->WaitForDataReadAndCallbacksIssued();
 
   // It should not have sent the callback message.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0u, sink().message_count());
 
   // Set a button down and wait for it to be read twice.
-  blink::WebGamepads button_down_data = default_data;
+  device::Gamepads button_down_data = default_data;
   button_down_data.items[0].buttons[0].value = 1.f;
   button_down_data.items[0].buttons[0].pressed = true;
   fetcher->SetTestData(button_down_data);
   fetcher->WaitForDataReadAndCallbacksIssued();
 
   // It should have sent a callback.
   base::RunLoop().RunUntilIdle();
   ppapi::proxy::ResourceMessageReplyParams reply_params;
   IPC::Message reply_msg;
   ASSERT_TRUE(sink().GetFirstResourceReplyMatching(
@@ skipping 18 matching lines @@
               buffer->buffer.items[0].buttons[i].pressed);
   }
 
   // Duplicate requests should be denied.
   EXPECT_EQ(PP_ERROR_FAILED,
             gamepad_host.OnResourceMessageReceived(
                 PpapiHostMsg_Gamepad_RequestMemory(), &context));
 }
 
 }  // namespace content