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

ash/wm/window_positioner_unittest.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.
 
 #include "ash/wm/window_positioner.h"
 
 #include <string>
 
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_state_aura.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 
 typedef test::AshTestBase WindowPositionerTest;
 
 TEST_F(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) {
   if (!SupportsMultipleDisplays())
     return;
@@ skipping 25 matching lines @@
   params.can_maximize = true;
   views::Widget* widget =
       shell::ToplevelWindow::CreateToplevelWindow(params);
   gfx::Rect bounds = widget->GetWindowBoundsInScreen();
 #if defined(OS_WIN)
   EXPECT_TRUE(widget->IsMaximized());
 #else
   // The window should be in the 2nd display with the default size.
   EXPECT_EQ("300x300", bounds.size().ToString());
 #endif
-  EXPECT_TRUE(gfx::Screen::GetScreen()
+  EXPECT_TRUE(display::Screen::GetScreen()
                   ->GetDisplayNearestWindow(second_root_window)
                   .bounds()
                   .Contains(bounds));
 }
 
 // Tests that second window inherits first window's maximized state as well as
 // its restore bounds.
 #if defined(OS_WIN) && !defined(USE_ASH)
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #define MAYBE_SecondMaximizedWindowHasProperRestoreSize \
@@ skipping 158 matching lines @@
   widget1->SetFullscreen(false);
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 
   // Closing 2nd widget triggers the rearrange logic but the 1st
   // widget should stay in the current size.
   widget2->CloseNow();
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 }
 
 }  // namespace ash