Rename gfx::test::TestScreen to display::test::TestScreen

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/display/screen.h"
-#include "ui/gfx/test/test_screen.h"
+#include "ui/display/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));
@@ skipping 38 matching lines @@
     content::Manifest::Icon icon;
     icon.src = GURL(url);
     if (!type.empty())
       icon.type = base::NullableString16(base::UTF8ToUTF16(type), false);
     icon.sizes = sizes;
 
     return icon;
   }
 
  private:
-  gfx::test::TestScreen test_screen_;
+  display::test::TestScreen test_screen_;
   int preferred_icon_size_ = DEFAULT_PREFERRED_ICON_SIZE;
 
   DISALLOW_COPY_AND_ASSIGN(ManifestIconSelectorTest);
 };
 
 TEST_F(ManifestIconSelectorTest, NoIcons) {
   // No icons should return the empty URL.
   std::vector<content::Manifest::Icon> icons;
   GURL url = FindBestMatchingIcon(icons);
   EXPECT_TRUE(url.is_empty());
@@ skipping 371 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());
   }
 }