Index: chrome/test/base/ui_test_utils.cc |
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc |
index 2ef86a680f6461706479d9066d54dd2d5629b99b..6ebbd913a660058505c938e9eff3b56df9827967 100644 |
--- a/chrome/test/base/ui_test_utils.cc |
+++ b/chrome/test/base/ui_test_utils.cc |
@@ -49,7 +49,6 @@ |
#include "components/prefs/pref_service.h" |
#include "content/public/browser/download_item.h" |
#include "content/public/browser/download_manager.h" |
-#include "content/public/browser/geolocation_provider.h" |
#include "content/public/browser/navigation_controller.h" |
#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/notification_service.h" |
@@ -57,12 +56,13 @@ |
#include "content/public/browser/storage_partition.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_contents_observer.h" |
-#include "content/public/common/geoposition.h" |
#include "content/public/common/resource_request_body.h" |
#include "content/public/test/browser_test_utils.h" |
#include "content/public/test/download_test_observer.h" |
#include "content/public/test/test_navigation_observer.h" |
#include "content/public/test/test_utils.h" |
+#include "device/geolocation/geolocation_provider.h" |
+#include "device/geolocation/geoposition.h" |
#include "net/base/filename_util.h" |
#include "net/cookies/cookie_constants.h" |
#include "net/cookies/cookie_monster.h" |
@@ -468,13 +468,13 @@ Browser* BrowserAddedObserver::WaitForSingleNewBrowser() { |
} |
void OverrideGeolocation(double latitude, double longitude) { |
- content::Geoposition position; |
+ device::Geoposition position; |
position.latitude = latitude; |
position.longitude = longitude; |
position.altitude = 0.; |
position.accuracy = 0.; |
position.timestamp = base::Time::Now(); |
- content::GeolocationProvider::GetInstance()->OverrideLocationForTesting( |
+ device::GeolocationProvider::GetInstance()->OverrideLocationForTesting( |
position); |
} |