Rename gfx::Screen/DIsplay to display::Screen/Display in ui/views_content_client

ui/views_content_client/views_content_client_main_parts_desktop_aura.cc

 // Copyright 2014 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 "base/macros.h"
 #include "content/shell/browser/shell_browser_context.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views_content_client/views_content_client.h"
 #include "ui/views_content_client/views_content_client_main_parts_aura.h"
 
 namespace ui {
 
 namespace {
 
 class ViewsContentClientMainPartsDesktopAura
     : public ViewsContentClientMainPartsAura {
@@ skipping 12 matching lines @@
 
 ViewsContentClientMainPartsDesktopAura::ViewsContentClientMainPartsDesktopAura(
     const content::MainFunctionParams& content_params,
     ViewsContentClient* views_content_client)
     : ViewsContentClientMainPartsAura(content_params, views_content_client) {
 }
 
 void ViewsContentClientMainPartsDesktopAura::PreMainMessageLoopRun() {
   ViewsContentClientMainPartsAura::PreMainMessageLoopRun();
 
-  gfx::Screen::SetScreenInstance(views::CreateDesktopScreen());
+  display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 
   views_content_client()->task().Run(browser_context(), NULL);
 }
 
 }  // namespace
 
 // static
 ViewsContentClientMainParts* ViewsContentClientMainParts::Create(
     const content::MainFunctionParams& content_params,
     ViewsContentClient* views_content_client) {
   return new ViewsContentClientMainPartsDesktopAura(
       content_params, views_content_client);
 }
 
 }  // namespace ui