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

ash/wm/workspace/workspace_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/workspace/workspace_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/activation_controller.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 
 using aura::Window;
 
 namespace ash {
 namespace internal {
 
 class WorkspaceManagerTest : public test::AshTestBase {
@@ skipping 138 matching lines @@
 
   w1->Show();
 
   ASSERT_TRUE(w1->layer() != NULL);
   EXPECT_TRUE(w1->layer()->visible());
 
   EXPECT_EQ(250, w1->bounds().width());
   EXPECT_EQ(251, w1->bounds().height());
 
   // Maximize the window.
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
+  Shell::GetInstance()->SetScreenWorkAreaInsets(
         gfx::Insets(0, 0, 30, 0));
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 
   // Should be 1 workspace, TYPE_MAXIMIZED with w1, fills the work area bounds.
   ASSERT_EQ(1u, workspaces().size());
   EXPECT_EQ(Workspace::TYPE_MAXIMIZED, workspaces()[0]->type());
   ASSERT_EQ(1u, workspaces()[0]->windows().size());
   EXPECT_EQ(w1.get(), workspaces()[0]->windows()[0]);
   EXPECT_EQ(GetWorkAreaBounds().width(), w1->bounds().width());
   EXPECT_EQ(GetWorkAreaBounds().height(), w1->bounds().height());
 
   // Change work area insets.
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
+  Shell::GetInstance()->SetScreenWorkAreaInsets(
         gfx::Insets(0, 0, 60, 0));
 
   // Should be 1 workspace, TYPE_MAXIMIZED with w1, fills the changed work
   // area bounds.
   ASSERT_EQ(1u, workspaces().size());
   EXPECT_EQ(Workspace::TYPE_MAXIMIZED, workspaces()[0]->type());
   ASSERT_EQ(1u, workspaces()[0]->windows().size());
   EXPECT_EQ(w1.get(), workspaces()[0]->windows()[0]);
   EXPECT_EQ(GetWorkAreaBounds().width(), w1->bounds().width());
   EXPECT_EQ(GetWorkAreaBounds().height(), w1->bounds().height());
@@ skipping 210 matching lines @@
   EXPECT_TRUE(w3->layer()->IsDrawn());
 
   w1->Show();
   EXPECT_TRUE(w1->layer()->IsDrawn());
   EXPECT_FALSE(w2->layer()->IsDrawn());
   EXPECT_FALSE(w3->layer()->IsDrawn());
 }
 
 }  // namespace internal
 }  // namespace ash