Revert of Reland: Geolocation: move from content/browser to device/

components/autofill/content/browser/risk/fingerprint_browsertest.cc

Index: components/autofill/content/browser/risk/fingerprint_browsertest.cc
diff --git a/components/autofill/content/browser/risk/fingerprint_browsertest.cc b/components/autofill/content/browser/risk/fingerprint_browsertest.cc
index c633f3746e0756aa0a94ba991643696c357cefbc..cc667d7570174a839b142a91591b497ccd2c9cfc 100644
--- a/components/autofill/content/browser/risk/fingerprint_browsertest.cc
+++ b/components/autofill/content/browser/risk/fingerprint_browsertest.cc
@@ -12,11 +12,11 @@
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
+#include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/gpu_data_manager.h"
+#include "content/public/common/geoposition.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/test_utils.h"
-#include "device/geolocation/geolocation_provider.h"
-#include "device/geolocation/geoposition.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
@@ -186,7 +186,7 @@
 
 // Test that getting a fingerprint works on some basic level.
 IN_PROC_BROWSER_TEST_F(AutofillRiskFingerprintTest, GetFingerprint) {
-  device::Geoposition position;
+  content::Geoposition position;
   position.latitude = kLatitude;
   position.longitude = kLongitude;
   position.altitude = kAltitude;
@@ -194,7 +194,7 @@
   position.timestamp =
       base::Time::UnixEpoch() +
       base::TimeDelta::FromMilliseconds(kGeolocationTime);
-  device::GeolocationProvider::GetInstance()->OverrideLocationForTesting(
+  content::GeolocationProvider::GetInstance()->OverrideLocationForTesting(
       position);
 
   blink::WebScreenInfo screen_info;