[Cleanup] Screen cleanup

ash/wm/panels/panel_layout_manager_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/panels/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 68 matching lines @@
         manager->panel_windows_.begin(), manager->panel_windows_.end(),
         panel);
     DCHECK(found != manager->panel_windows_.end());
     DCHECK(found->callout_widget);
     return reinterpret_cast<views::Widget*>(found->callout_widget);
   }
 
   void PanelInScreen(aura::Window* panel) {
     gfx::Rect panel_bounds = panel->GetBoundsInRootWindow();
     gfx::Point root_point = gfx::Point(panel_bounds.x(), panel_bounds.y());
-    gfx::Display display = ScreenAsh::FindDisplayContainingPoint(root_point);
+    gfx::Display display = ScreenUtil::FindDisplayContainingPoint(root_point);
 
     gfx::Rect panel_bounds_in_screen = panel->GetBoundsInScreen();
     gfx::Point screen_bottom_right = gfx::Point(
         panel_bounds_in_screen.right(),
         panel_bounds_in_screen.bottom());
     gfx::Rect display_bounds = display.bounds();
     EXPECT_TRUE(screen_bottom_right.x() < display_bounds.width() &&
                 screen_bottom_right.y() < display_bounds.height());
   }
 
@@ skipping 676 matching lines @@
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace internal
 }  // namespace ash