Clean up WifiDataProvider(Manager)

content/browser/geolocation/wifi_data_provider_manager.h

 // Copyright 2013 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.
 
 // A wifi data provider provides wifi data from the device that is used by a
 // NetworkLocationProvider to obtain a position fix. We use a singleton
 // instance of the wifi data provider manager, which is used by multiple
 // NetworkLocationProvider objects.
 //
 // This file provides WifiDataProviderManager, which provides static methods to
@@ skipping 20 matching lines @@
 
 class WifiDataProvider;
 
 // A manager for wifi data providers.
 //
 // We use a singleton instance of this class which is shared by multiple network
 // location providers. These location providers access the instance through the
 // Register and Unregister methods.
 class CONTENT_EXPORT WifiDataProviderManager {
  public:
+  typedef WifiDataProvider* (*ImplFactoryFunction)(void);
+
   // Sets the factory function which will be used by Register to create the
   // implementation used by the singleton instance. This factory approach is
   // used both to abstract accross platform-specific implementations and to
   // inject mock implementations for testing.
-  typedef WifiDataProvider* (*ImplFactoryFunction)(void);
-  static void SetFactory(ImplFactoryFunction factory_function_in);
+  static void SetFactoryForTesting(ImplFactoryFunction factory_function_in);
 
   // Resets the factory function to the default.
-  static void ResetFactory();
+  static void ResetFactoryForTesting();
 
-  typedef base::Callback<void(WifiDataProviderManager*)> WifiDataUpdateCallback;
+  typedef base::Closure WifiDataUpdateCallback;
 
   // Registers a callback, which will be run whenever new data is available.
   // Instantiates the singleton if necessary, and always returns it.
   static WifiDataProviderManager* Register(WifiDataUpdateCallback* callback);
 
   // Removes a callback. If this is the last callback, deletes the singleton
   // instance. Return value indicates success.
   static bool Unregister(WifiDataUpdateCallback* callback);
 
   // Provides whatever data the provider has, which may be nothing. Return
@@ skipping 26 matching lines @@
 
   // The internal implementation.
   scoped_refptr<WifiDataProvider> impl_;
 
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_