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

chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc

 // Copyright (c) 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/ui/views/frame/browser_view.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/views/focus/focus_manager.h"
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/browser_window_state.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #endif
 
 using views::FocusManager;
 
 typedef InProcessBrowserTest BrowserViewTest;
 
 // Active window and focus testing is not reliable on Windows crbug.com/79493
 #if defined(OS_WIN)
 #define MAYBE_FullscreenClearsFocus DISABLED_FullscreenClearsFocus
 #else
@@ skipping 45 matching lines @@
   browser()->window()->Close();
 
   // Create a new app browser
   Browser* browser = new Browser(params);
   ASSERT_TRUE(browser);
   gfx::NativeWindow window = browser->window()->GetNativeWindow();
   gfx::Rect original_bounds(gfx::Rect(150, 250, 400, 100));
   window->SetBounds(original_bounds);
   window->Show();
   // Dock the browser window using |kShowStateKey| property.
-  gfx::Rect work_area = gfx::Screen::GetScreen()
+  gfx::Rect work_area = display::Screen::GetScreen()
                             ->GetDisplayNearestPoint(window->bounds().origin())
                             .work_area();
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DOCKED);
 
   // Saved placement should reflect docked state (for app windows only in Ash).
   gfx::Rect bounds;
   ui::WindowShowState show_state = ui::SHOW_STATE_DEFAULT;
   const views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
   widget->widget_delegate()->GetSavedWindowPlacement(widget, &bounds,
                                                      &show_state);
@@ skipping 56 matching lines @@
   window = browser->window()->GetNativeWindow();
   EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL,
             window->GetProperty(aura::client::kShowStateKey));
 }
 
 INSTANTIATE_TEST_CASE_P(BrowserViewTestTabbedOrApp,
                         BrowserViewTestParam,
                         testing::Bool());
 #endif