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

content/browser/geolocation/wifi_data_provider_common_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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/utf_string_conversions.h"
@@ skipping 49 matching lines @@
 // Stops the specified (nested) message loop when the listener is called back.
 class MessageLoopQuitListener
     : public WifiDataProviderCommon::ListenerInterface {
  public:
   explicit MessageLoopQuitListener(MessageLoop* message_loop)
       : message_loop_to_quit_(message_loop) {
     CHECK(message_loop_to_quit_ != NULL);
   }
   // 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_;
 };
 
 
 class WifiDataProviderCommonWithMock : public WifiDataProviderCommon {
  public:
   WifiDataProviderCommonWithMock()
       : new_wlan_api_(new MockWlanApi),
         new_polling_policy_(new MockPollingPolicy) {}
 
   // WifiDataProviderCommon
@@ skipping 129 matching lines @@
   WifiData data;
   EXPECT_TRUE(provider_->GetData(&data));
   EXPECT_EQ(1, static_cast<int>(data.access_point_data.size()));
   EXPECT_EQ(single_access_point.ssid, data.access_point_data.begin()->ssid);
 }
 
 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