Clean up WifiDataProvider(Manager)

content/browser/geolocation/wifi_data_provider_manager.h

Index: content/browser/geolocation/wifi_data_provider_manager.h
diff --git a/content/browser/geolocation/wifi_data_provider_manager.h b/content/browser/geolocation/wifi_data_provider_manager.h
index 24075077c4bc838e53212d3fcc1a7f861a879d34..611cd940ed4c650e04507439b68925e145f0ba2c 100644
--- a/content/browser/geolocation/wifi_data_provider_manager.h
+++ b/content/browser/geolocation/wifi_data_provider_manager.h
@@ -38,17 +38,18 @@ class WifiDataProvider;
 // 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.