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

ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

 // Copyright (c) 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/content/keyboard_overlay/keyboard_overlay_delegate.h"
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class KeyboardOverlayDelegateTest
     : public test::AshTestBase,
       public testing::WithParamInterface<wm::ShelfAlignment> {
  public:
   KeyboardOverlayDelegateTest() : shelf_alignment_(GetParam()) {}
   virtual ~KeyboardOverlayDelegateTest() {}
@@ skipping 18 matching lines @@
   // Showing the dialog creates a widget.
   views::Widget* widget = delegate.Show(NULL);
   EXPECT_TRUE(widget);
 
   // The widget is on the primary root window.
   EXPECT_EQ(Shell::GetPrimaryRootWindow(),
             widget->GetNativeWindow()->GetRootWindow());
 
   // The widget is horizontally centered at the bottom of the work area.
   gfx::Rect work_area =
-      gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
+      display::Screen::GetScreen()->GetPrimaryDisplay().work_area();
   gfx::Rect bounds = widget->GetRestoredBounds();
   EXPECT_EQ(work_area.CenterPoint().x(), bounds.CenterPoint().x());
   EXPECT_EQ(work_area.bottom(), bounds.bottom());
 
   // Clean up.
   widget->CloseNow();
 }
 
 // Tests run three times - for all possible values of shelf alignment
 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny,
                         KeyboardOverlayDelegateTest,
                         testing::Values(wm::SHELF_ALIGNMENT_BOTTOM,
                                         wm::SHELF_ALIGNMENT_LEFT,
                                         wm::SHELF_ALIGNMENT_RIGHT,
                                         wm::SHELF_ALIGNMENT_BOTTOM_LOCKED));
 
 }  // namespace ash