Refactoring gamepad polling to support dynamically added sources

content/browser/gamepad/gamepad_test_helpers.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/gamepad/gamepad_test_helpers.h"
 
 #include "content/browser/gamepad/gamepad_service.h"
 
 namespace content {
 
 MockGamepadDataFetcher::MockGamepadDataFetcher(
     const blink::WebGamepads& test_data)
     : test_data_(test_data),
       read_data_(false, false) {
 }
 
 MockGamepadDataFetcher::~MockGamepadDataFetcher() {
 }
 
-void MockGamepadDataFetcher::GetGamepadData(blink::WebGamepads* pads,
-                                            bool devices_changed_hint) {
+void MockGamepadDataFetcher::GetGamepadData(bool devices_changed_hint) {
   {
     base::AutoLock lock(lock_);
-    *pads = test_data_;
+
+    for (unsigned int i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) {
+      if (test_data_.items[i].connected) {

[scottmg, 2016/01/18 22:54:52]

Does this need to reset anything in the non-connected state? It looks like it
would have before.

[bajones, 2016/01/20 22:49:32]

That resetting now happens in the GamepadProvider. It's one of the benefits of
this refactor that we don't rely on the data fetchers for that kind of
management/cleanup any more.

+        PadState* pad = provider()->GetPadState(GAMEPAD_SOURCE_TEST, i);
+        if (pad)
+          memcpy(&pad->data, &test_data_.items[i], sizeof(blink::WebGamepad));
+      }
+    }
   }
   read_data_.Signal();
 }
 
 void MockGamepadDataFetcher::WaitForDataRead() {
   return read_data_.Wait();
 }
 
 void MockGamepadDataFetcher::WaitForDataReadAndCallbacksIssued() {
   // The provider will read the data on the background thread (setting the
@@ skipping 20 matching lines @@
   data_fetcher_ = new MockGamepadDataFetcher(test_data);
   gamepad_service_ =
       new GamepadService(scoped_ptr<GamepadDataFetcher>(data_fetcher_));
 }
 
 GamepadServiceTestConstructor::~GamepadServiceTestConstructor() {
   delete gamepad_service_;
 }
 
 }  // namespace content