Clean up WifiDataProvider(Manager)

content/browser/geolocation/wifi_data_provider_common_unittest.cc

Index: content/browser/geolocation/wifi_data_provider_common_unittest.cc
diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
index d6a3b0862724e37bcfd427c2aabc10a9d021ce56..e66f32e175f31f0129fe5b8ce91a96e5e249bdde 100644
--- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
@@ -68,7 +68,7 @@ class MessageLoopQuitter {
     CHECK(message_loop_to_quit_ != NULL);
   }
 
-  void OnWifiDataUpdate(WifiDataProviderManager* manager) {
+  void OnWifiDataUpdate() {
     // Provider should call back on client's thread.
     EXPECT_EQ(base::MessageLoop::current(), message_loop_to_quit_);
     message_loop_to_quit_->QuitNow();
@@ -219,11 +219,12 @@ TEST_F(GeolocationWifiDataProviderCommonTest, DoScanWithResults) {
 
 TEST_F(GeolocationWifiDataProviderCommonTest, RegisterUnregister) {
   MessageLoopQuitter loop_quitter(&main_message_loop_);
-  WifiDataProviderManager::SetFactory(CreateWifiDataProviderCommonWithMock);
+  WifiDataProviderManager::SetFactoryForTesting(
+      CreateWifiDataProviderCommonWithMock);
   WifiDataProviderManager::Register(&loop_quitter.callback_);
   main_message_loop_.Run();
   WifiDataProviderManager::Unregister(&loop_quitter.callback_);
-  WifiDataProviderManager::ResetFactory();
+  WifiDataProviderManager::ResetFactoryForTesting();
 }
 
 }  // namespace content