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

content/browser/geolocation/wifi_data_provider_unittest.cc

Index: content/browser/geolocation/wifi_data_provider_unittest.cc
diff --git a/content/browser/geolocation/device_data_provider_unittest.cc b/content/browser/geolocation/wifi_data_provider_unittest.cc
similarity index 82%
rename from content/browser/geolocation/device_data_provider_unittest.cc
rename to content/browser/geolocation/wifi_data_provider_unittest.cc
index 640a8fc32c219c3250843cb29a05f0f158777c74..9a4655e90fcc181d66be747e54ad5fb05ef79a0a 100644
--- a/content/browser/geolocation/device_data_provider_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/threading/platform_thread.h"
-#include "content/browser/geolocation/device_data_provider.h"
 #include "content/browser/geolocation/wifi_data_provider_common.h"
+#include "content/browser/geolocation/wifi_data_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -13,8 +13,7 @@ class NullWifiDataListenerInterface
     : public WifiDataProviderCommon::ListenerInterface {
  public:
   // ListenerInterface
-  virtual void DeviceDataUpdateAvailable(
-      DeviceDataProvider<WifiData>* provider) {}
+  virtual void DeviceDataUpdateAvailable(WifiDataProvider* provider) {}
 };
 
 TEST(GeolocationDeviceDataProviderWifiData, CreateDestroy) {
@@ -25,12 +24,12 @@ TEST(GeolocationDeviceDataProviderWifiData, CreateDestroy) {
   MessageLoopForUI main_message_loop;
   NullWifiDataListenerInterface listener;
   for (int i = 0; i < 10; i++) {
-    DeviceDataProvider<WifiData>::Register(&listener);
+    WifiDataProvider::Register(&listener);
     for (int j = 0; j < 10; j++) {
       base::PlatformThread::Sleep(base::TimeDelta());
       main_message_loop.RunAllPending();  // See comment above
     }
-    DeviceDataProvider<WifiData>::Unregister(&listener);
+    WifiDataProvider::Unregister(&listener);
     for (int j = 0; j < 10; j++) {
       base::PlatformThread::Sleep(base::TimeDelta());
       main_message_loop.RunAllPending();  // See comment above