Move gamepad_service out of content/ and into device/

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>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
-#include "content/browser/gamepad/gamepad_service_test_helpers.h"
 #include "content/browser/renderer_host/pepper/browser_ppapi_host_test.h"
-#include "content/common/gamepad_hardware_buffer.h"
+#include "device/gamepad/gamepad_shared_buffer.h"
 #include "device/gamepad/gamepad_test_helpers.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/proxy/gamepad_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/shared_impl/ppb_gamepad_shared.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 class PepperGamepadHostTest : public testing::Test,
                               public BrowserPpapiHostTest {
  public:
   PepperGamepadHostTest() {}
   ~PepperGamepadHostTest() override {}
 
   void ConstructService(const blink::WebGamepads& test_data) {
-    service_.reset(new GamepadServiceTestConstructor(test_data));
+    service_.reset(new device::GamepadServiceTestConstructor(test_data));
   }
 
-  GamepadService* gamepad_service() { return service_->gamepad_service(); }
+  device::GamepadService* gamepad_service() {
+    return service_->gamepad_service();
+  }
 
  protected:
-  std::unique_ptr<GamepadServiceTestConstructor> service_;
+  std::unique_ptr<device::GamepadServiceTestConstructor> service_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperGamepadHostTest);
 };
 
 inline ptrdiff_t AddressDiff(const void* a, const void* b) {
   return static_cast<const char*>(a) - static_cast<const char*>(b);
 }
 
 }  // namespace
 
 // Validate the memory layout of the Pepper proxy struct matches the content
 // one. The proxy can't depend on content so has a duplicate definition. This
 // code can see both definitions so we do the validation here.
 TEST_F(PepperGamepadHostTest, ValidateHardwareBuffersMatch) {
   // Hardware buffer.
   static_assert(sizeof(ppapi::ContentGamepadHardwareBuffer) ==
-                    sizeof(GamepadHardwareBuffer),
+                    sizeof(device::GamepadHardwareBuffer),
                 "gamepad hardware buffers must match");
   ppapi::ContentGamepadHardwareBuffer ppapi_buf;
-  GamepadHardwareBuffer content_buf;
-  EXPECT_EQ(AddressDiff(&content_buf.sequence, &content_buf),
+  device::GamepadHardwareBuffer content_buf;
+  EXPECT_EQ(AddressDiff(&content_buf.seqlock, &content_buf),
             AddressDiff(&ppapi_buf.sequence, &ppapi_buf));
-  EXPECT_EQ(AddressDiff(&content_buf.buffer, &content_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),
                 "gamepads data must match");
   ppapi::WebKitGamepads ppapi_gamepads;
   blink::WebGamepads web_gamepads;
   EXPECT_EQ(AddressDiff(&web_gamepads.length, &web_gamepads),
@@ skipping 115 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