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

Unified Diff: content/browser/geolocation/location_arbitrator_impl_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/location_arbitrator_impl_unittest.cc
diff --git a/device/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
similarity index 97%
rename from device/geolocation/location_arbitrator_impl_unittest.cc
rename to content/browser/geolocation/location_arbitrator_impl_unittest.cc
index fec25bf3d570d232f3f0914e9bfcec38d9d744ca..7363cdb10c7b0cd20c01ec29880198997f58ad9b 100644
--- a/device/geolocation/location_arbitrator_impl_unittest.cc
+++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
@@ -2,22 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "device/geolocation/location_arbitrator_impl.h"
+#include "content/browser/geolocation/location_arbitrator_impl.h"
#include <memory>
#include "base/bind.h"
#include "base/memory/ptr_util.h"
-#include "device/geolocation/fake_access_token_store.h"
-#include "device/geolocation/geolocation_delegate.h"
-#include "device/geolocation/geoposition.h"
-#include "device/geolocation/mock_location_provider.h"
+#include "content/browser/geolocation/fake_access_token_store.h"
+#include "content/browser/geolocation/mock_location_provider.h"
+#include "content/public/browser/geolocation_delegate.h"
+#include "content/public/common/geoposition.h"
+#include "content/test/test_content_browser_client.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::NiceMock;
-namespace device {
+namespace content {
class MockLocationObserver {
public:
@@ -439,4 +440,4 @@ TEST_F(GeolocationLocationArbitratorTest, TwoOneShotsIsNewPositionBetter) {
CheckLastPositionInfo(3, 139, 150);
}
-} // namespace device
+} // namespace content
« no previous file with comments | « content/browser/geolocation/location_arbitrator_impl.cc ('k') | content/browser/geolocation/location_provider_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698