Clean up WifiDataProvider(Manager)

content/browser/geolocation/wifi_data_provider_manager.cc

Index: content/browser/geolocation/wifi_data_provider_manager.cc
diff --git a/content/browser/geolocation/wifi_data_provider_manager.cc b/content/browser/geolocation/wifi_data_provider_manager.cc
index 1dc1770a1911222d7dbae080d18c15e6ac2fd3f5..84e3ef8ab093b1fdc6230617d7ea592457dfa580 100644
--- a/content/browser/geolocation/wifi_data_provider_manager.cc
+++ b/content/browser/geolocation/wifi_data_provider_manager.cc
@@ -16,13 +16,13 @@ WifiDataProviderManager::ImplFactoryFunction
     WifiDataProviderManager::factory_function_ = DefaultFactoryFunction;
 
 // static
-void WifiDataProviderManager::SetFactory(
+void WifiDataProviderManager::SetFactoryForTesting(
     ImplFactoryFunction factory_function_in) {
   factory_function_ = factory_function_in;
 }
 
 // static
-void WifiDataProviderManager::ResetFactory() {
+void WifiDataProviderManager::ResetFactoryForTesting() {
   factory_function_ = DefaultFactoryFunction;
 }
 
@@ -65,12 +65,9 @@ WifiDataProviderManager::WifiDataProviderManager() {
   DCHECK(factory_function_);
   impl_ = (*factory_function_)();
   DCHECK(impl_.get());
-  impl_->SetContainer(this);
 }
 
 WifiDataProviderManager::~WifiDataProviderManager() {

[timvolodine, 2014/08/20 16:05:40]

does it still need a DCHECK(impl_)?

[Michael van Ouwerkerk, 2014/08/21 15:46:23]

Yes, looks like I was overzealous with the delete key here. Done.

-  DCHECK(impl_.get());
-  impl_->SetContainer(NULL);
 }
 
 bool WifiDataProviderManager::GetData(WifiData* data) {