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

ash/wm/workspace/multi_window_resize_controller_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 "ash/wm/workspace/multi_window_resize_controller.h"
 
 #include "ash/ash_constants.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_test_helper.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace_controller_test_helper.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 
 namespace {
 
 // WidgetDelegate for a resizable widget which creates a NonClientFrameView
 // which is actually used in Ash.
 class TestWidgetDelegate : public views::WidgetDelegateView {
@@ skipping 336 matching lines @@
 
   // Clicking outside the resize handle should immediately hide the resize
   // handle.
   EXPECT_FALSE(resize_widget_bounds_in_screen.Contains(w1_center_in_screen));
   generator.MoveMouseTo(w1_center_in_screen);
   generator.ClickLeftButton();
   EXPECT_FALSE(IsShowing());
 }
 
 }  // namespace ash