Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:…

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/content/browser/risk/fingerprint.h"
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #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"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "ui/gfx/geometry/rect.h"
 
 using testing::ElementsAre;
 
 namespace autofill {
 namespace risk {
@@ skipping 149 matching lines @@
   const gfx::Rect screen_bounds_;
   const gfx::Rect available_screen_bounds_;
   const gfx::Rect unavailable_screen_bounds_;
 
   // A message loop to block on the asynchronous loading of the fingerprint.
   base::MessageLoopForUI message_loop_;
 };
 
 // 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;
   position.accuracy = kAccuracy;
   position.timestamp =
       base::Time::UnixEpoch() +
       base::TimeDelta::FromMilliseconds(kGeolocationTime);
-  device::GeolocationProvider::GetInstance()->OverrideLocationForTesting(
+  content::GeolocationProvider::GetInstance()->OverrideLocationForTesting(
       position);
 
   blink::WebScreenInfo screen_info;
   screen_info.depth = kScreenColorDepth;
   screen_info.rect = blink::WebRect(screen_bounds_);
   screen_info.availableRect = blink::WebRect(available_screen_bounds_);
 
   internal::GetFingerprintInternal(
       kObfuscatedGaiaId, window_bounds_, content_bounds_, screen_info,
       "25.0.0.123", kCharset, kAcceptLanguages, base::Time::Now(), kLocale,
       kUserAgent,
       base::TimeDelta::FromDays(1),  // Ought to be longer than any test run.
       base::Bind(&AutofillRiskFingerprintTest::GetFingerprintTestCallback,
                  base::Unretained(this)));
 
   // Wait for the callback to be called.
   message_loop_.Run();
 }
 
 }  // namespace risk
 }  // namespace autofill