Clean up WifiDataProvider(Manager)

content/browser/geolocation/wifi_data_provider_manager.cc

 // Copyright 2013 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 "content/browser/geolocation/wifi_data_provider_manager.h"
 
 #include "content/browser/geolocation/wifi_data_provider.h"
 
 namespace content {
 
 // static
 WifiDataProviderManager* WifiDataProviderManager::instance_ = NULL;
 
 // static
 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;
 }
 
 // static
 WifiDataProviderManager* WifiDataProviderManager::Register(
     WifiDataUpdateCallback* callback) {
   bool need_to_start_data_provider = false;
   if (!instance_) {
     instance_ = new WifiDataProviderManager();
     need_to_start_data_provider = true;
@@ skipping 22 matching lines @@
     delete instance_;
     instance_ = NULL;
   }
   return true;
 }
 
 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) {
   return impl_->GetData(data);
 }
 
 void WifiDataProviderManager::AddCallback(WifiDataUpdateCallback* callback) {
   impl_->AddCallback(callback);
 }
 
 bool WifiDataProviderManager::RemoveCallback(WifiDataUpdateCallback* callback) {
   return impl_->RemoveCallback(callback);
 }
 
 bool WifiDataProviderManager::has_callbacks() const {
   return impl_->has_callbacks();
 }
 
 void WifiDataProviderManager::StartDataProvider() {
   impl_->StartDataProvider();
 }
 
 void WifiDataProviderManager::StopDataProvider() {
   impl_->StopDataProvider();
 }
 
 }  // namespace content