Remove RadioData from geolocation

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/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 111 matching lines @@
 
 template<typename DataType>
 MockDeviceDataProviderImpl<DataType>*
 MockDeviceDataProviderImpl<DataType>::instance_ = NULL;
 
 // Main test fixture
 class GeolocationNetworkProviderTest : public testing::Test {
  public:
   virtual void SetUp() {
     access_token_store_ = new FakeAccessTokenStore;
-    radio_data_provider_ =
-        MockDeviceDataProviderImpl<RadioData>::CreateInstance();
     wifi_data_provider_ =
         MockDeviceDataProviderImpl<WifiData>::CreateInstance();
   }
 
   virtual void TearDown() {
     WifiDataProvider::ResetFactory();
-    RadioDataProvider::ResetFactory();
   }
 
   LocationProviderBase* CreateProvider(bool set_permission_granted) {
     LocationProviderBase* 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() : test_server_url_(kTestServerUrl) {
     // 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.
-    RadioDataProvider::SetFactory(
-        MockDeviceDataProviderImpl<RadioData>::GetInstance);
     WifiDataProvider::SetFactory(
         MockDeviceDataProviderImpl<WifiData>::GetInstance);
   }
 
   // Returns the current url fetcher (if any) and advances the id ready for the
   // next test step.
   TestURLFetcher* get_url_fetcher_and_advance_id() {
     TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(
             NetworkLocationRequest::url_fetcher_id_for_tests);
     if (fetcher)
@@ skipping 96 matching lines @@
       EXPECT_EQ(expected_wifi_tokens[5], actual_wifi_tokens[5]);
       EXPECT_EQ(expected_wifi_tokens[6], actual_wifi_tokens[6]);
     }
     EXPECT_TRUE(GURL(request_url).is_valid());
   }
 
   const GURL test_server_url_;
   MessageLoop main_message_loop_;
   scoped_refptr<FakeAccessTokenStore> access_token_store_;
   TestURLFetcherFactory url_fetcher_factory_;
-  scoped_refptr<MockDeviceDataProviderImpl<RadioData> > radio_data_provider_;
   scoped_refptr<MockDeviceDataProviderImpl<WifiData> > wifi_data_provider_;
 };
 
 
 TEST_F(GeolocationNetworkProviderTest, CreateDestroy) {
   // Test fixture members were SetUp correctly.
   EXPECT_EQ(&main_message_loop_, MessageLoop::current());
   scoped_ptr<LocationProviderBase> provider(CreateProvider(true));
   EXPECT_TRUE(NULL != provider.get());
   provider.reset();
@@ skipping 20 matching lines @@
   main_message_loop_.RunAllPending();
   TestURLFetcher* fetcher = get_url_fetcher_and_advance_id();
   ASSERT_TRUE(fetcher != NULL);
   // The request url should have been shortened to less than 2048 characters
   // in length by not including access points with the lowest signal strength
   // in the request.
   EXPECT_LT(fetcher->GetOriginalURL().spec().size(), size_t(2048));
   CheckRequestIsValid(fetcher->GetOriginalURL().spec(), 0, 16, 4, "");
 }
 
-TEST_F(GeolocationNetworkProviderTest, MultipleStartProvider) {
-  scoped_ptr<LocationProviderBase> provider_1(CreateProvider(true));
-  scoped_ptr<LocationProviderBase> provider_2(CreateProvider(true));
-  ASSERT_TRUE(radio_data_provider_);
-  ASSERT_TRUE(wifi_data_provider_);
-  EXPECT_EQ(0, radio_data_provider_->start_calls_);
-  EXPECT_EQ(0, wifi_data_provider_->start_calls_);
-  EXPECT_EQ(0, radio_data_provider_->stop_calls_);
-  EXPECT_EQ(0, wifi_data_provider_->stop_calls_);
-
-  // Start first provider.
-  EXPECT_TRUE(provider_1->StartProvider(false));
-  EXPECT_EQ(1, radio_data_provider_->start_calls_);
-  EXPECT_EQ(1, wifi_data_provider_->start_calls_);
-  // Start second provider.
-  EXPECT_TRUE(provider_2->StartProvider(false));
-  EXPECT_EQ(1, radio_data_provider_->start_calls_);
-  EXPECT_EQ(1, wifi_data_provider_->start_calls_);
-
-  // Stop first provider.
-  provider_1->StopProvider();
-  EXPECT_EQ(0, radio_data_provider_->stop_calls_);
-  EXPECT_EQ(0, wifi_data_provider_->stop_calls_);
-  // Stop second provider.
-  provider_2->StopProvider();
-  EXPECT_EQ(1, radio_data_provider_->stop_calls_);
-  EXPECT_EQ(1, wifi_data_provider_->stop_calls_);
-}
-
 TEST_F(GeolocationNetworkProviderTest, MultiRegistrations) {
   // TODO(joth): Strictly belongs in a base-class unit test file.
   MessageLoopQuitListener listener;
   scoped_ptr<LocationProviderBase> provider(CreateProvider(true));
   EXPECT_FALSE(provider->has_listeners());
   provider->RegisterListener(&listener);
   EXPECT_TRUE(provider->has_listeners());
   provider->RegisterListener(&listener);
   EXPECT_TRUE(provider->has_listeners());
 
@@ skipping 198 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