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

Unified Diff: content/browser/geolocation/wifi_data_provider_common_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_common_unittest.cc
diff --git a/device/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
similarity index 96%
rename from device/geolocation/wifi_data_provider_common_unittest.cc
rename to content/browser/geolocation/wifi_data_provider_common_unittest.cc
index bd8562d922a17e6da8157fca48f7159531ce7866..1c09c4d00c2581b6420eda5410e2ca867882a039 100644
--- a/device/geolocation/wifi_data_provider_common_unittest.cc
+++ b/content/browser/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 "device/geolocation/wifi_data_provider_common.h"
+#include "content/browser/geolocation/wifi_data_provider_common.h"
#include <memory>
@@ -12,7 +12,8 @@
#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"
@@ -22,7 +23,7 @@ using testing::DoDefault;
using testing::Invoke;
using testing::Return;
-namespace device {
+namespace content {
class MockWlanApi : public WifiDataProviderCommon::WlanApiInterface {
public:
@@ -124,7 +125,7 @@ class GeolocationWifiDataProviderCommonTest : public testing::Test {
}
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_;
@@ -236,4 +237,4 @@ TEST_F(GeolocationWifiDataProviderCommonTest, RegisterUnregister) {
WifiDataProviderManager::ResetFactoryForTesting();
}
-} // namespace device
+} // namespace content
« no previous file with comments | « content/browser/geolocation/wifi_data_provider_common.cc ('k') | content/browser/geolocation/wifi_data_provider_common_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698