Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Unified Diff: content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc

Issue 2192683003: Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2810
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
diff --git a/device/geolocation/wifi_data_provider_chromeos_unittest.cc b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
similarity index 94%
rename from device/geolocation/wifi_data_provider_chromeos_unittest.cc
rename to content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
index 70e469e35afb67172316e54710bcd61e9c85f13b..64bce2732f6cf70bf00a50ff46ad23234e9c5b15 100644
--- a/device/geolocation/wifi_data_provider_chromeos_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -10,11 +9,12 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_manager_client.h"
#include "chromeos/network/geolocation_handler.h"
-#include "device/geolocation/wifi_data_provider_chromeos.h"
+#include "content/browser/geolocation/wifi_data_provider_chromeos.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
-namespace device {
+namespace content {
class GeolocationChromeOsWifiDataProviderTest : public testing::Test {
protected:
@@ -62,7 +62,7 @@ class GeolocationChromeOsWifiDataProviderTest : public testing::Test {
base::RunLoop().RunUntilIdle();
}
- base::MessageLoopForUI message_loop_;
+ TestBrowserThreadBundle thread_bundle_;
scoped_refptr<WifiDataProviderChromeOs> provider_;
chromeos::ShillManagerClient* manager_client_;
chromeos::ShillManagerClient::TestInterface* manager_test_;
@@ -99,4 +99,4 @@ TEST_F(GeolocationChromeOsWifiDataProviderTest, GetManyAccessPoints) {
ASSERT_EQ(12u, ap_data_.size());
}
-} // namespace device
+} // namespace content
« no previous file with comments | « content/browser/geolocation/wifi_data_provider_chromeos.cc ('k') | content/browser/geolocation/wifi_data_provider_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698