[Cleanup] Screen cleanup

ash/wm/solo_window_tracker_unittest.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 "ash/wm/solo_window_tracker.h"
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 85 matching lines @@
     window->SetBounds(gfx::Rect(100, 100));
     ParentWindowInPrimaryRootWindow(window);
     return window;
   }
 
   // Drag |window| to the dock.
   void DockWindow(aura::Window* window) {
     // Because the tests use windows without delegates,
     // aura::test::EventGenerator cannot be used.
     gfx::Point drag_to =
-        ash::ScreenAsh::GetDisplayBoundsInParent(window).top_right();
+        ash::ScreenUtil::GetDisplayBoundsInParent(window).top_right();
     scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window,
         window->bounds().origin(),
         HTCAPTION,
         aura::client::WINDOW_MOVE_SOURCE_MOUSE));
     resizer->Drag(drag_to, 0);
     resizer->CompleteDrag();
     EXPECT_EQ(internal::kShellWindowId_DockedContainer,
               window->parent()->id());
   }
 
   // Drag |window| out of the dock.
   void UndockWindow(aura::Window* window) {
     gfx::Point drag_to =
-        ash::ScreenAsh::GetDisplayWorkAreaBoundsInParent(window).top_right() -
+        ash::ScreenUtil::GetDisplayWorkAreaBoundsInParent(window).top_right() -
         gfx::Vector2d(10, 0);
     scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window,
         window->bounds().origin(),
         HTCAPTION,
         aura::client::WINDOW_MOVE_SOURCE_MOUSE));
     resizer->Drag(drag_to, 0);
     resizer->CompleteDrag();
     EXPECT_NE(internal::kShellWindowId_DockedContainer,
               window->parent()->id());
   }
 
   // Returns the primary display.
   gfx::Display GetPrimaryDisplay() {
     return ash::Shell::GetInstance()->GetScreen()->GetPrimaryDisplay();
   }
 
   // Returns the secondary display.
   gfx::Display GetSecondaryDisplay() {
-    return ScreenAsh::GetSecondaryDisplay();
+    return ScreenUtil::GetSecondaryDisplay();
   }
 
   // Returns the window which uses the solo header, if any, on the primary
   // display.
   aura::Window* GetWindowWithSoloHeaderInPrimary() {
     return GetWindowWithSoloHeader(Shell::GetPrimaryRootWindow());
   }
 
   // Returns the window which uses the solo header, if any, in |root|.
   aura::Window* GetWindowWithSoloHeader(aura::Window* root) {
@@ skipping 170 matching lines @@
   WindowRepaintChecker checker2(w2.get());
 
   // Now there are two windows in the same display, so we should not use solo
   // headers.
   EXPECT_EQ(NULL, GetWindowWithSoloHeaderInPrimary());
   EXPECT_TRUE(checker1.IsPaintScheduledAndReset());
 
   // Moves the second window to the secondary display.  Both w1/w2 should be
   // solo.
   w2->SetBoundsInScreen(gfx::Rect(1200, 0, 100, 100),
-                        ScreenAsh::GetSecondaryDisplay());
+                        ScreenUtil::GetSecondaryDisplay());
   EXPECT_EQ(w1.get(), GetWindowWithSoloHeaderInPrimary());
   EXPECT_EQ(w2.get(), GetWindowWithSoloHeader(w2->GetRootWindow()));
   EXPECT_TRUE(checker1.IsPaintScheduledAndReset());
   EXPECT_TRUE(checker2.IsPaintScheduledAndReset());
 
   // Open two more windows in the primary display.
   scoped_ptr<aura::Window> w3(CreateWindowInPrimary());
   w3->SetBoundsInScreen(gfx::Rect(0, 0, 100, 100), GetPrimaryDisplay());
   w3->Show();
   scoped_ptr<aura::Window> w4(CreateWindowInPrimary());
@@ skipping 77 matching lines @@
   w.reset();
   EXPECT_EQ(NULL, GetWindowWithSoloHeaderInPrimary());
 
   // Recreate another window again.
   w.reset(CreateWindowInPrimary());
   w->Show();
   EXPECT_EQ(w.get(), GetWindowWithSoloHeaderInPrimary());
 }
 
 }  // namespace ash