Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:…

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 "device/geolocation/wifi_data_provider_common.h"
+#include "content/browser/geolocation/wifi_data_provider_common.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "device/geolocation/wifi_data_provider_manager.h"
+#include "content/browser/geolocation/wifi_data_provider_manager.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::AtLeast;
 using testing::DoDefault;
 using testing::Invoke;
 using testing::Return;
 
-namespace device {
+namespace content {
 
 class MockWlanApi : public WifiDataProviderCommon::WlanApiInterface {
  public:
   MockWlanApi() : calls_(0), bool_return_(true) {
     ANNOTATE_BENIGN_RACE(&calls_, "This is a test-only data race on a counter");
     ON_CALL(*this, GetAccessPointData(_))
         .WillByDefault(Invoke(this, &MockWlanApi::GetAccessPointDataInternal));
   }
 
   MOCK_METHOD1(GetAccessPointData, bool(WifiData::AccessPointDataSet* data));
@@ skipping 81 matching lines @@
     EXPECT_TRUE(main_task_runner_->BelongsToCurrentThread());
     run_loop_->Quit();
   }
 
   void RunLoop() {
     run_loop_.reset(new base::RunLoop());
     run_loop_->Run();
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
+  TestBrowserThreadBundle thread_bundle_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   std::unique_ptr<base::RunLoop> run_loop_;
   WifiDataProviderManager::WifiDataUpdateCallback wifi_data_callback_;
   scoped_refptr<WifiDataProviderCommonWithMock> provider_;
   MockWlanApi* wlan_api_;
   MockPollingPolicy* polling_policy_;
 };
 
 TEST_F(GeolocationWifiDataProviderCommonTest, CreateDestroy) {
   // Test fixture members were SetUp correctly.
@@ skipping 91 matching lines @@
 
 TEST_F(GeolocationWifiDataProviderCommonTest, RegisterUnregister) {
   WifiDataProviderManager::SetFactoryForTesting(
       CreateWifiDataProviderCommonWithMock);
   WifiDataProviderManager::Register(&wifi_data_callback_);
   RunLoop();
   WifiDataProviderManager::Unregister(&wifi_data_callback_);
   WifiDataProviderManager::ResetFactoryForTesting();
 }
 
-}  // namespace device
+}  // namespace content