Aura/Ash split: Move ScreenAura to ash::ScreenAsh.

ash/wm/toplevel_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/toplevel_layout_manager.h"
 
+#include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/screen_aura.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 class ToplevelLayoutManagerTest : public test::AshTestBase {
  public:
   ToplevelLayoutManagerTest() : layout_manager_(NULL) {}
   virtual ~ToplevelLayoutManagerTest() {}
 
   internal::ToplevelLayoutManager* layout_manager() {
     return layout_manager_;
   }
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
-    Shell::GetRootWindow()->SetScreenWorkAreaInsets(
+    Shell::GetInstance()->SetScreenWorkAreaInsets(
         gfx::Insets(1, 2, 3, 4));
     Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600));
     aura::Window* default_container = Shell::GetInstance()->GetContainer(
         internal::kShellWindowId_DefaultContainer);
     layout_manager_ = new internal::ToplevelLayoutManager();
     default_container->SetLayoutManager(layout_manager_);
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     return aura::test::CreateTestWindowWithBounds(bounds, NULL);
@@ skipping 51 matching lines @@
             window->bounds());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds, window->bounds());
 }
 
 // Tests maximized window resizing on work area insets change.
 TEST_F(ToplevelLayoutManagerTest,
        ResizeMaximizedWindowOnWorkAreaInsetsChange) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
-        gfx::Insets(0, 0, 30, 0));
+  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets(0, 0, 30, 0));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   // Maximized window fills the work area.
   EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()),
             window->bounds());
 
   // Change work area insets.
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
-        gfx::Insets(0, 0, 60, 0));
+  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets(0, 0, 60, 0));
   // Maximized window fills the changed work area.
   EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()),
             window->bounds());
 }
 
 // Tests fullscreen window size during root window resize.
 TEST_F(ToplevelLayoutManagerTest, FullscreenRootWindowResize) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
   // Fullscreen window fills the whole monitor.
@@ skipping 94 matching lines @@
   window.reset();
   // shelf_layout_manager is observing these animations so clean them up first.
   launcher->GetNativeView()->layer()->GetAnimator()->StopAnimating();
   status->GetNativeView()->layer()->GetAnimator()->StopAnimating();
   shelf_layout_manager.reset();
 }
 
 }  // namespace
 
 }  // namespace ash