Cleaner organization of WifiDataProvider code.

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"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/geolocation/fake_access_token_store.h"
 #include "content/browser/geolocation/location_arbitrator_impl.h"
 #include "content/browser/geolocation/network_location_provider.h"
+#include "content/browser/geolocation/wifi_data_provider.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 // Constants used in multiple tests.
 const char kTestServerUrl[] = "https://www.geolocation.test/service";
 const char kAccessTokenString[] = "accessToken";
 
@@ skipping 13 matching lines @@
                         const Geoposition& position) {
     EXPECT_EQ(client_message_loop_, base::MessageLoop::current());
     updated_provider_ = provider;
     client_message_loop_->Quit();
   }
 
   base::MessageLoop* client_message_loop_;
   const LocationProvider* updated_provider_;
 };
 
-// A mock implementation of WifiDataProviderImplBase for testing. Adapted from
+// A mock implementation of WifiDataProvider for testing. Adapted from
 // http://gears.googlecode.com/svn/trunk/gears/geolocation/geolocation_test.cc
-class MockWifiDataProviderImpl : public WifiDataProviderImplBase {
+class MockWifiDataProvider : public WifiDataProvider {
  public:
   // Factory method for use with WifiDataProvider::SetFactory.
-  static WifiDataProviderImplBase* GetInstance() {
+  static WifiDataProvider* GetInstance() {
     CHECK(instance_);
     return instance_;
   }
 
-  static MockWifiDataProviderImpl* CreateInstance() {
+  static MockWifiDataProvider* CreateInstance() {
     CHECK(!instance_);
-    instance_ = new MockWifiDataProviderImpl;
+    instance_ = new MockWifiDataProvider;
     return instance_;
   }
 
-  MockWifiDataProviderImpl()
-      : start_calls_(0),
-        stop_calls_(0),
-        got_data_(true) {
-  }
+  MockWifiDataProvider() : start_calls_(0), stop_calls_(0), got_data_(true) {}
 
-  // WifiDataProviderImplBase implementation.
+  // WifiDataProvider implementation.
   virtual void StartDataProvider() OVERRIDE {
     ++start_calls_;
   }
 
   virtual void StopDataProvider() OVERRIDE {
     ++stop_calls_;
   }
 
   virtual bool GetData(WifiData* data_out) OVERRIDE {
     CHECK(data_out);
     *data_out = data_;
     return got_data_;
   }
 
   void SetData(const WifiData& new_data) {
     got_data_ = true;
     const bool differs = data_.DiffersSignificantly(new_data);
     data_ = new_data;
     if (differs)
       this->RunCallbacks();
   }
 
   void set_got_data(bool got_data) { got_data_ = got_data; }
   int start_calls_;
   int stop_calls_;
 
  private:
-  virtual ~MockWifiDataProviderImpl() {
+  virtual ~MockWifiDataProvider() {
     CHECK(this == instance_);
     instance_ = NULL;
   }
 
-  static MockWifiDataProviderImpl* instance_;
+  static MockWifiDataProvider* instance_;
 
   WifiData data_;
   bool got_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockWifiDataProviderImpl);
+  DISALLOW_COPY_AND_ASSIGN(MockWifiDataProvider);
 };
 
-MockWifiDataProviderImpl* MockWifiDataProviderImpl::instance_ = NULL;
+MockWifiDataProvider* MockWifiDataProvider::instance_ = NULL;
 
 // 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_ =
-        MockWifiDataProviderImpl::CreateInstance();
+    wifi_data_provider_ = MockWifiDataProvider::CreateInstance();
   }
 
-  virtual void TearDown() {
-    WifiDataProvider::ResetFactory();
-  }
+  virtual void TearDown() { WifiDataProviderManager::ResetFactory(); }
 
   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.
-    WifiDataProvider::SetFactory(MockWifiDataProviderImpl::GetInstance);
+    WifiDataProviderManager::SetFactory(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 160 matching lines @@
     } else {
       ASSERT_FALSE(request_json->HasKey("wifiAccessPoints"));
     }
     EXPECT_TRUE(request_url.is_valid());
   }
 
   GURL test_server_url_;
   base::MessageLoop main_message_loop_;
   scoped_refptr<FakeAccessTokenStore> access_token_store_;
   net::TestURLFetcherFactory url_fetcher_factory_;
-  scoped_refptr<MockWifiDataProviderImpl> wifi_data_provider_;
+  scoped_refptr<MockWifiDataProvider> wifi_data_provider_;
 };
 
 TEST_F(GeolocationNetworkProviderTest, CreateDestroy) {
   // Test fixture members were SetUp correctly.
   EXPECT_EQ(&main_message_loop_, base::MessageLoop::current());
   scoped_ptr<LocationProvider> provider(CreateProvider(true));
   EXPECT_TRUE(NULL != provider.get());
   provider.reset();
   SUCCEED();
 }
@@ skipping 220 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