Rename gfx::Display/Screen to display::Display/Screen in chrome

chrome/browser/manifest/manifest_icon_selector_unittest.cc

 // Copyright 2015 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 "chrome/browser/manifest/manifest_icon_selector.h"
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/test/test_screen.h"
 
 namespace {
 const int DEFAULT_PREFERRED_ICON_SIZE = 48;
 }
 
 class ManifestIconSelectorTest : public testing::Test  {
  protected:
   ManifestIconSelectorTest() {
     test_screen_.display()->set_id(0x1337);
     test_screen_.display()->set_bounds(gfx::Rect(0, 0, 2560, 1440));
-    gfx::Screen::SetScreenInstance(&test_screen_);
+    display::Screen::SetScreenInstance(&test_screen_);
   }
 
   ~ManifestIconSelectorTest() override {
-    gfx::Screen::SetScreenInstance(nullptr);
+    display::Screen::SetScreenInstance(nullptr);
   }
 
   void SetUp() override {
     SetPreferredIconSizeInDp(DEFAULT_PREFERRED_ICON_SIZE);
   }
 
   GURL FindBestMatchingIconWithMinimum(
       const std::vector<content::Manifest::Icon>& icons,
       int minimum_icon_size_in_dp) {
     return ManifestIconSelector::FindBestMatchingIcon(
@@ skipping 415 matching lines @@
     std::vector<content::Manifest::Icon> icons;
     icons.push_back(CreateIcon("http://foo.com/icon_no1.png", "", sizes));
     icons.push_back(CreateIcon("http://foo.com/icon_no2.png", "", sizes));
     icons.push_back(CreateIcon("http://foo.com/icon.png", "", sizes));
 
     SetDisplayDeviceScaleFactor(3.0f);
     GURL url = FindBestMatchingIcon(icons);
     EXPECT_EQ("http://foo.com/icon.png", url.spec());
   }
 }