Clean up WifiDataProvider(Manager)

content/browser/geolocation/network_location_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/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 33 matching lines @@
   }
 
   base::MessageLoop* client_message_loop_;
   const LocationProvider* updated_provider_;
 };
 
 // A mock implementation of WifiDataProvider for testing. Adapted from
 // http://gears.googlecode.com/svn/trunk/gears/geolocation/geolocation_test.cc
 class MockWifiDataProvider : public WifiDataProvider {
  public:
-  // Factory method for use with WifiDataProvider::SetFactory.
+  // Factory method for use with WifiDataProvider::SetFactoryForTesting.
   static WifiDataProvider* GetInstance() {
     CHECK(instance_);
     return instance_;
   }
 
   static MockWifiDataProvider* CreateInstance() {
     CHECK(!instance_);
     instance_ = new MockWifiDataProvider;
     return instance_;
   }
@@ skipping 45 matching lines @@
 
 // Main test fixture
 class GeolocationNetworkProviderTest : public testing::Test {
  public:
   virtual void SetUp() {
     test_server_url_ = GURL(kTestServerUrl);
     access_token_store_ = new FakeAccessTokenStore;
     wifi_data_provider_ = MockWifiDataProvider::CreateInstance();
   }
 
-  virtual void TearDown() { WifiDataProviderManager::ResetFactory(); }
+  virtual void TearDown() { WifiDataProviderManager::ResetFactoryForTesting(); }
 
   LocationProvider* CreateProvider(bool set_permission_granted) {
     LocationProvider* provider = NewNetworkLocationProvider(
         access_token_store_.get(),
         NULL,  // No URLContextGetter needed, as using test urlfecther factory.
         test_server_url_,
         access_token_store_->access_token_set_[test_server_url_]);
     if (set_permission_granted)
       provider->OnPermissionGranted();
     return provider;
   }
 
  protected:
   GeolocationNetworkProviderTest() {
     // TODO(joth): Really these should be in SetUp, not here, but they take no
     // effect on Mac OS Release builds if done there. I kid not. Figure out why.
-    WifiDataProviderManager::SetFactory(MockWifiDataProvider::GetInstance);
+    WifiDataProviderManager::SetFactoryForTesting(
+        MockWifiDataProvider::GetInstance);
   }
 
   // Returns the current url fetcher (if any) and advances the id ready for the
   // next test step.
   net::TestURLFetcher* get_url_fetcher_and_advance_id() {
     net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(
             NetworkLocationRequest::url_fetcher_id_for_tests);
     if (fetcher)
       ++NetworkLocationRequest::url_fetcher_id_for_tests;
     return fetcher;
@@ skipping 401 matching lines @@
       EXPECT_TRUE(cache.FindPosition(CreateReferenceWifiScanData(1)));
     } else {
       const int evicted = i - kCacheSize;
       EXPECT_FALSE(cache.FindPosition(CreateReferenceWifiScanData(evicted)));
       EXPECT_TRUE(cache.FindPosition(CreateReferenceWifiScanData(evicted + 1)));
     }
   }
 }
 
 }  // namespace content