[WIP] attempt to allow chrome OS to inject its wifi data provider

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 664421d899ce44883a5ede711276c41ae4380a55..771a478a64ecb1237d64976626f5832244a49eaa 100644
--- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
@@ -67,14 +67,14 @@ class MessageLoopQuitListener
   }
   // ListenerInterface
   virtual void DeviceDataUpdateAvailable(
-      DeviceDataProvider<WifiData>* provider) {
+      WifiDataProvider* provider) {
     // Provider should call back on client's thread.
     EXPECT_EQ(MessageLoop::current(), message_loop_to_quit_);
     provider_ = provider;
     message_loop_to_quit_->QuitNow();
   }
   MessageLoop* message_loop_to_quit_;
-  DeviceDataProvider<WifiData>* provider_;
+  WifiDataProvider* provider_;
 };
 
 
@@ -224,10 +224,10 @@ TEST_F(GeolocationWifiDataProviderCommonTest,
        StartThreadViaDeviceDataProvider) {
   MessageLoopQuitListener quit_listener(&main_message_loop_);
   WifiDataProvider::SetFactory(CreateWifiDataProviderCommonWithMock);
-  DeviceDataProvider<WifiData>::Register(&quit_listener);
+  WifiDataProvider::Register(&quit_listener);
   main_message_loop_.Run();
-  DeviceDataProvider<WifiData>::Unregister(&quit_listener);
-  DeviceDataProvider<WifiData>::ResetFactory();
+  WifiDataProvider::Unregister(&quit_listener);
+  WifiDataProvider::ResetFactory();
 }
 
 }  // namespace