Reland 2:Geolocation: move from content/browser to device/

device/geolocation/wifi_data_provider_common_unittest.cc

Index: device/geolocation/wifi_data_provider_common_unittest.cc
diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/device/geolocation/wifi_data_provider_common_unittest.cc
similarity index 96%
rename from content/browser/geolocation/wifi_data_provider_common_unittest.cc
rename to device/geolocation/wifi_data_provider_common_unittest.cc
index 1c09c4d00c2581b6420eda5410e2ca867882a039..bd8562d922a17e6da8157fca48f7159531ce7866 100644
--- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/device/geolocation/wifi_data_provider_common_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/geolocation/wifi_data_provider_common.h"
+#include "device/geolocation/wifi_data_provider_common.h"
 
 #include <memory>
 
@@ -12,8 +12,7 @@
 #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 "content/browser/geolocation/wifi_data_provider_manager.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "device/geolocation/wifi_data_provider_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -23,7 +22,7 @@ using testing::DoDefault;
 using testing::Invoke;
 using testing::Return;
 
-namespace content {
+namespace device {
 
 class MockWlanApi : public WifiDataProviderCommon::WlanApiInterface {
  public:
@@ -125,7 +124,7 @@ class GeolocationWifiDataProviderCommonTest : public testing::Test {
   }
 
  protected:
-  TestBrowserThreadBundle thread_bundle_;
+  base::MessageLoopForUI message_loop_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   std::unique_ptr<base::RunLoop> run_loop_;
   WifiDataProviderManager::WifiDataUpdateCallback wifi_data_callback_;
@@ -237,4 +236,4 @@ TEST_F(GeolocationWifiDataProviderCommonTest, RegisterUnregister) {
   WifiDataProviderManager::ResetFactoryForTesting();
 }
 
-}  // namespace content
+}  // namespace device