Change blink::WebScreenInfo to content::ScreenInfo

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 "base/run_loop.h"
 #include "build/build_config.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "content/public/browser/gpu_data_manager.h"
+#include "content/public/common/screen_info.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 {
 
 namespace internal {
 
 // Defined in the implementation file corresponding to this test.
 void GetFingerprintInternal(
     uint64_t obfuscated_gaia_id,
     const gfx::Rect& window_bounds,
     const gfx::Rect& content_bounds,
-    const blink::WebScreenInfo& screen_info,
+    const content::ScreenInfo& screen_info,
     const std::string& version,
     const std::string& charset,
     const std::string& accept_languages,
     const base::Time& install_time,
     const std::string& app_locale,
     const std::string& user_agent,
     const base::TimeDelta& timeout,
     const base::Callback<void(std::unique_ptr<Fingerprint>)>& callback);
 
 }  // namespace internal
@@ skipping 141 matching lines @@
   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(
       position);
 
-  blink::WebScreenInfo screen_info;
+  content::ScreenInfo screen_info;
   screen_info.depth = kScreenColorDepth;
-  screen_info.rect = blink::WebRect(screen_bounds_);
-  screen_info.availableRect = blink::WebRect(available_screen_bounds_);
+  screen_info.rect = screen_bounds_;
+  screen_info.available_rect = 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.
   base::RunLoop().Run();
 }
 
 }  // namespace risk
 }  // namespace autofill