Remove ui/gfx/screen_type_delegate.h

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

 // Copyright 2013 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.
 //
 // Generating a fingerprint consists of two major steps:
 //   (1) Gather all the necessary data.
 //   (2) Write it into a protocol buffer.
 //
 // Step (2) is as simple as it sounds -- it's really just a matter of copying
 // data.  Step (1) requires waiting on several asynchronous callbacks, which are
@@ skipping 108 matching lines @@
 
 // This function writes
 //   (a) the number of screens,
 //   (b) the primary display's screen size,
 //   (c) the screen's color depth, and
 //   (d) the size of the screen unavailable to web page content,
 //       i.e. the Taskbar size on Windows
 // into the |machine|.
 void AddScreenInfoToFingerprint(const WebScreenInfo& screen_info,
                                 Fingerprint::MachineCharacteristics* machine) {
-  // TODO(scottmg): NativeScreen maybe wrong. http://crbug.com/133312
-  machine->set_screen_count(
-      gfx::Screen::GetNativeScreen()->GetNumDisplays());
+  machine->set_screen_count(gfx::Screen::GetScreen()->GetNumDisplays());
 
   const gfx::Size screen_size =
-      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().GetSizeInPixel();
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
   machine->mutable_screen_size()->set_width(screen_size.width());
   machine->mutable_screen_size()->set_height(screen_size.height());
 
   machine->set_screen_color_depth(screen_info.depth);
 
   const gfx::Rect screen_rect(screen_info.rect);
   const gfx::Rect available_rect(screen_info.availableRect);
   const gfx::Rect unavailable_rect =
       gfx::SubtractRects(screen_rect, available_rect);
   machine->mutable_unavailable_screen_size()->set_width(
@@ skipping 329 matching lines @@
     host_view->GetRenderWidgetHost()->GetWebScreenInfo(&screen_info);
 
   internal::GetFingerprintInternal(
       obfuscated_gaia_id, window_bounds, content_bounds, screen_info, version,
       charset, accept_languages, install_time, app_locale, user_agent,
       base::TimeDelta::FromSeconds(kTimeoutSeconds), callback);
 }
 
 }  // namespace risk
 }  // namespace autofill