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

content/common/cursors/webcursor_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/pickle.h"
 #include "build/build_config.h"
 #include "content/common/cursors/webcursor.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 249 matching lines @@
     SkAutoLockPixels lock(cursor_info.custom_image);
     EXPECT_EQ(kUnpremul_SkAlphaType, cursor_info.custom_image.alphaType());
     EXPECT_EQ(testColor,
               SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0,0)));
   }
 #endif
 }
 
 #if defined(USE_AURA)
 TEST(WebCursorTest, CursorScaleFactor) {
-  gfx::Display display;
+  display::Display display;
   display.set_device_scale_factor(80.2f);
 
   WebCursor::CursorInfo info;
   info.image_scale_factor = 2.0f;
 
   WebCursor cursor;
   cursor.InitFromCursorInfo(info);
   cursor.SetDisplayInfo(display);
 
   EXPECT_EQ(40.1f, cursor.GetCursorScaleFactor());
@@ skipping 21 matching lines @@
   EXPECT_EQ(kUnpremul_SkAlphaType, image_copy.alphaType());
   EXPECT_EQ(2, image_copy.width());
   EXPECT_EQ(2, image_copy.height());
   EXPECT_EQ(0, hotspot.x());
   EXPECT_EQ(1, hotspot.y());
 }
 #endif
 
 #if defined(OS_WIN)
 void ScaleCursor(float scaleFactor, int hotspotX, int hotspotY) {
-  gfx::Display display;
+  display::Display display;
   display.set_device_scale_factor(scaleFactor);
 
   WebCursor::CursorInfo info;
   info.type = WebCursorInfo::TypeCustom;
   info.hotspot = gfx::Point(hotspotX, hotspotY);
 
   info.custom_image = SkBitmap();
   info.custom_image.allocN32Pixels(10, 10);
   info.custom_image.eraseColor(0);
 
@@ skipping 13 matching lines @@
 }
 
 TEST(WebCursorTest, WindowsCursorScaledAtHiDpi) {
   ScaleCursor(2.0f, 4, 6);
   ScaleCursor(1.5f, 2, 8);
   ScaleCursor(1.25f, 3, 7);
 }
 #endif
 
 }  // namespace content