Revert of Refactoring gamepad polling to support dynamically added sources

content/browser/gamepad/gamepad_service.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_SERVICE_H_
 #define CONTENT_BROWSER_GAMEPAD_GAMEPAD_SERVICE_H_
 
 #include <set>
 
 #include "base/callback_forward.h"
@@ skipping 61 matching lines @@
 
   // Stop/join with the background thread in GamepadProvider |provider_|.
   void Terminate();
 
   // Called on IO thread when a gamepad is connected.
   void OnGamepadConnected(int index, const blink::WebGamepad& pad);
 
   // Called on IO thread when a gamepad is disconnected.
   void OnGamepadDisconnected(int index, const blink::WebGamepad& pad);
 
-  GamepadProvider* provider() { return provider_.get(); }
-
  private:
   friend struct base::DefaultSingletonTraits<GamepadService>;
   friend class GamepadServiceTestConstructor;
   friend class GamepadServiceTest;
 
   GamepadService();
 
   // Constructor for testing. This specifies the data fetcher to use for a
   // provider, bypassing the default platform one.
-  explicit GamepadService(scoped_ptr<GamepadDataFetcher> fetcher);
+  GamepadService(scoped_ptr<GamepadDataFetcher> fetcher);
 
   virtual ~GamepadService();
 
-  static void SetInstance(GamepadService* instance);
+  static void SetInstance(GamepadService*);
 
   void OnUserGesture();
 
   struct ConsumerInfo {
     ConsumerInfo(GamepadConsumer* consumer)
         : consumer(consumer),
           did_observe_user_gesture(false) {
     }
 
     bool operator<(const ConsumerInfo& other) const {
@@ skipping 15 matching lines @@
   int num_active_consumers_;
 
   bool gesture_callback_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(GamepadService);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GAMEPAD_GAMEPAD_SERVICE_H_