Remove threading from WifiDataProviderCommon.

content/browser/geolocation/wifi_data_provider_common_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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
@@ skipping 128 matching lines @@
   EXPECT_EQ(&main_message_loop_, base::MessageLoop::current());
   EXPECT_TRUE(NULL != provider_.get());
   EXPECT_TRUE(NULL != wlan_api_);
 }
 
 TEST_F(GeolocationWifiDataProviderCommonTest, StartThread) {
   EXPECT_CALL(*wlan_api_, GetAccessPointData(_))
       .Times(AtLeast(1));
   EXPECT_CALL(*polling_policy_, PollingInterval())
       .Times(AtLeast(1));
-  EXPECT_TRUE(provider_->StartDataProvider());
+  provider_->StartDataProvider();
   main_message_loop_.Run();
   SUCCEED();
 }
 
 TEST_F(GeolocationWifiDataProviderCommonTest, NoWifi){
   EXPECT_CALL(*polling_policy_, NoWifiInterval())
       .Times(AtLeast(1));
   EXPECT_CALL(*wlan_api_, GetAccessPointData(_))
       .WillRepeatedly(Return(false));
   provider_->StartDataProvider();
@@ skipping 21 matching lines @@
   provider_->StartDataProvider();
   main_message_loop_.Run();
   main_message_loop_.Run();
 }
 
 TEST_F(GeolocationWifiDataProviderCommonTest, DoAnEmptyScan) {
   EXPECT_CALL(*wlan_api_, GetAccessPointData(_))
       .Times(AtLeast(1));
   EXPECT_CALL(*polling_policy_, PollingInterval())
       .Times(AtLeast(1));
-  EXPECT_TRUE(provider_->StartDataProvider());
+  provider_->StartDataProvider();
   main_message_loop_.Run();
   // Check we had at least one call. The worker thread may have raced ahead
   // and made multiple calls.
   EXPECT_GT(wlan_api_->calls_, 0);
   WifiData data;
   EXPECT_TRUE(provider_->GetData(&data));
   EXPECT_EQ(0, static_cast<int>(data.access_point_data.size()));
 }
 
 TEST_F(GeolocationWifiDataProviderCommonTest, DoScanWithResults) {
   EXPECT_CALL(*wlan_api_, GetAccessPointData(_))
       .Times(AtLeast(1));
   EXPECT_CALL(*polling_policy_, PollingInterval())
       .Times(AtLeast(1));
   AccessPointData single_access_point;
   single_access_point.channel = 2;
   single_access_point.mac_address = 3;
   single_access_point.radio_signal_strength = 4;
   single_access_point.signal_to_noise = 5;
   single_access_point.ssid = ASCIIToUTF16("foossid");
   wlan_api_->data_out_.insert(single_access_point);
 
-  EXPECT_TRUE(provider_->StartDataProvider());
+  provider_->StartDataProvider();
   main_message_loop_.Run();
   EXPECT_GT(wlan_api_->calls_, 0);
   WifiData data;
   EXPECT_TRUE(provider_->GetData(&data));
   EXPECT_EQ(1, static_cast<int>(data.access_point_data.size()));
   EXPECT_EQ(single_access_point.ssid, data.access_point_data.begin()->ssid);
 }
 
 TEST_F(GeolocationWifiDataProviderCommonTest,
        StartThreadViaDeviceDataProvider) {
   MessageLoopQuitListener quit_listener(&main_message_loop_);
   WifiDataProvider::SetFactory(CreateWifiDataProviderCommonWithMock);
   DeviceDataProvider<WifiData>::Register(&quit_listener);
   main_message_loop_.Run();
   DeviceDataProvider<WifiData>::Unregister(&quit_listener);
   DeviceDataProvider<WifiData>::ResetFactory();
 }
 
 }  // namespace content