Movw GamepadService out of content/browser/ and into device/

content/renderer/gamepad_shared_memory_reader.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/renderer/gamepad_shared_memory_reader.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/gamepad_hardware_buffer.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/renderer_blink_platform_impl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/public/platform/WebGamepadListener.h"
 #include "third_party/WebKit/public/platform/WebPlatformEventListener.h"
 
 namespace content {
 
 GamepadSharedMemoryReader::GamepadSharedMemoryReader(RenderThread* thread)
     : RendererGamepadProvider(thread),
@@ skipping 48 matching lines @@
     return;
 
   // Only try to read this many times before failing to avoid waiting here
   // very long in case of contention with the writer. TODO(scottmg) Tune this
   // number (as low as 1?) if histogram shows distribution as mostly
   // 0-and-maximum.
   const int kMaximumContentionCount = 10;
   int contention_count = -1;
   base::subtle::Atomic32 version;
   do {
-    version = gamepad_hardware_buffer_->sequence.ReadBegin();
-    memcpy(&read_into, &gamepad_hardware_buffer_->buffer, sizeof(read_into));
+    version = gamepad_hardware_buffer_->seqlock.ReadBegin();
+    memcpy(&read_into, &gamepad_hardware_buffer_->data, sizeof(read_into));
     ++contention_count;
     if (contention_count == kMaximumContentionCount)
       break;
-  } while (gamepad_hardware_buffer_->sequence.ReadRetry(version));
+  } while (gamepad_hardware_buffer_->seqlock.ReadRetry(version));
   UMA_HISTOGRAM_COUNTS("Gamepad.ReadContentionCount", contention_count);
 
   if (contention_count >= kMaximumContentionCount) {
     // We failed to successfully read, presumably because the hardware
     // thread was taking unusually long. Don't copy the data to the output
     // buffer, and simply leave what was there before.
     return;
   }
 
   // New data was read successfully, copy it into the output buffer.
@@ skipping 35 matching lines @@
 }
 
 void GamepadSharedMemoryReader::OnGamepadDisconnected(
     int index,
     const blink::WebGamepad& gamepad) {
   if (listener())
     listener()->didDisconnectGamepad(index, gamepad);
 }
 
 } // namespace content