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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf.h"
@@ skipping 1746 matching lines @@
       ash::test::ShelfTestAPI(secondary_shelf).shelf_view());
   AppListService* service = AppListService::Get();
 
   // There should be two items in our shelf by this time.
   EXPECT_EQ(2, model_->item_count());
   EXPECT_FALSE(service->IsAppListVisible());
 
   // Open the app list menu and check that the drag and drop host was set.
   gfx::Rect app_list_bounds =
       test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
-  gfx::Display display =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(secondary_root_window);
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(
+          secondary_root_window);
   const gfx::Point& origin = display.bounds().origin();
   app_list_bounds.Offset(-origin.x(), -origin.y());
 
   generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
                         app_list_bounds.CenterPoint().y());
   generator.ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(service->IsAppListVisible());
 
   // Click the "all apps" button on the start page.
@@ skipping 453 matching lines @@
   controller_->ActivateApp(bookmark_app->id(), ash::LAUNCH_FROM_APP_LIST, 0);
 
   // There should be two new browsers.
   EXPECT_EQ(3u, chrome::GetBrowserCount(browser()->profile()));
 
   // The apps should now be running, with the last opened app active.
   EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_ACTIVE,
             model_->ItemByID(bookmark_app_shelf_id)->status);
 }