Split gamepad provider from test runner controller

content/shell/renderer/test_runner/gamepad_controller.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 "content/shell/renderer/test_runner/gamepad_controller.h"
 
 #include "content/shell/renderer/test_runner/web_test_delegate.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
@@ skipping 119 matching lines @@
   if (controller_)
     controller_->SetAxisCount(index, axes);
 }
 
 void GamepadControllerBindings::SetAxisData(int index, int axis, double data) {
   if (controller_)
     controller_->SetAxisData(index, axis, data);
 }
 
 // static
-base::WeakPtr<GamepadController> GamepadController::Create(WebTestDelegate* delegate) {
+base::WeakPtr<GamepadController> GamepadController::Create(
+    WebTestDelegate* delegate) {
   CHECK(delegate);
 
   GamepadController* controller = new GamepadController();
-  delegate->SetGamepadProvider(scoped_ptr<RendererGamepadProvider>(controller));
+  delegate->SetGamepadProvider(controller);
   return controller->weak_factory_.GetWeakPtr();
 }
 
 GamepadController::GamepadController()
-    : RendererGamepadProvider(0),
-      weak_factory_(this) {
+    : listener_(nullptr), weak_factory_(this) {
   Reset();
 }
 
 GamepadController::~GamepadController() {
-  StopIfObserving();
 }
 
 void GamepadController::Reset() {
   memset(&gamepads_, 0, sizeof(gamepads_));
 }
 
 void GamepadController::Install(WebFrame* frame) {
   GamepadControllerBindings::Install(weak_factory_.GetWeakPtr(), frame);
 }
 
-
 void GamepadController::SampleGamepads(blink::WebGamepads& gamepads) {
   memcpy(&gamepads, &gamepads_, sizeof(blink::WebGamepads));
 }
 
-bool GamepadController::OnControlMessageReceived(const IPC::Message& msg) {
-  return false;
-}
-
-void GamepadController::SendStartMessage() {
-}
-
-void GamepadController::SendStopMessage() {
+void GamepadController::SetListener(blink::WebGamepadListener* listener) {
+  listener_ = listener;
 }
 
 void GamepadController::Connect(int index) {
   if (index < 0 || index >= static_cast<int>(WebGamepads::itemsLengthCap))
     return;
   gamepads_.items[index].connected = true;
   gamepads_.length = 0;
   for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
     if (gamepads_.items[i].connected)
       gamepads_.length = i + 1;
   }
 }
 
 void GamepadController::DispatchConnected(int index) {
   if (index < 0 || index >= static_cast<int>(WebGamepads::itemsLengthCap)
       || !gamepads_.items[index].connected)
     return;
   const WebGamepad& pad = gamepads_.items[index];
-  if (listener())
-    listener()->didConnectGamepad(index, pad);
+  if (listener_)
+    listener_->didConnectGamepad(index, pad);
 }
 
 void GamepadController::Disconnect(int index) {
   if (index < 0 || index >= static_cast<int>(WebGamepads::itemsLengthCap))
     return;
   WebGamepad& pad = gamepads_.items[index];
   pad.connected = false;
   gamepads_.length = 0;
   for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
     if (gamepads_.items[i].connected)
       gamepads_.length = i + 1;
   }
-  if (listener())
-    listener()->didDisconnectGamepad(index, pad);
+  if (listener_)
+    listener_->didDisconnectGamepad(index, pad);
 }
 
 void GamepadController::SetId(int index, const std::string& src) {
   if (index < 0 || index >= static_cast<int>(WebGamepads::itemsLengthCap))
     return;
   const char* p = src.c_str();
   memset(gamepads_.items[index].id, 0, sizeof(gamepads_.items[index].id));
   for (unsigned i = 0; *p && i < WebGamepad::idLengthCap - 1; ++i)
     gamepads_.items[index].id[i] = *p++;
 }
@@ skipping 25 matching lines @@
 
 void GamepadController::SetAxisData(int index, int axis, double data) {
   if (index < 0 || index >= static_cast<int>(WebGamepads::itemsLengthCap))
     return;
   if (axis < 0 || axis >= static_cast<int>(WebGamepad::axesLengthCap))
     return;
   gamepads_.items[index].axes[axis] = data;
 }
 
 }  // namespace content