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

content/browser/geolocation/wifi_data_provider_unittest.cc

 // Copyright (c) 2012 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.
 
 #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 {
 
 class NullWifiDataListenerInterface
     : public WifiDataProviderCommon::ListenerInterface {
  public:
   // ListenerInterface
-  virtual void DeviceDataUpdateAvailable(
-      DeviceDataProvider<WifiData>* provider) {}
+  virtual void DeviceDataUpdateAvailable(WifiDataProvider* provider) {}
 };
 
 TEST(GeolocationDeviceDataProviderWifiData, CreateDestroy) {
   // See http://crbug.com/59913 .  The main_message_loop is not required to be
   // run for correct behaviour, but we run it in this test to help smoke out
   // any race conditions between processing in the main loop and the setup /
   // tear down of the DeviceDataProvider thread.
   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
     }
   }
 }
 
 }  // namespace