Second attempt at moving the StackingClient to a property on the RootWindow.

ui/aura_shell/workspace/workspace_manager_unittest.cc

 // Copyright (c) 2011 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 "ui/aura_shell/workspace/workspace_manager.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/activation_controller.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_observer.h"
 #include "ui/base/ui_base_types.h"
 
 namespace {
 using aura_shell::internal::Workspace;
 using aura_shell::internal::WorkspaceManager;
@@ skipping 51 matching lines @@
 };
 
 }  // namespace
 
 namespace aura_shell {
 namespace internal {
 
 class WorkspaceManagerTestBase : public aura::test::AuraTestBase {
  public:
   WorkspaceManagerTestBase() {
-    aura::test::TestStackingClient* stacking_client =
-        static_cast<aura::test::TestStackingClient*>(
-            aura::RootWindow::GetInstance()->stacking_client());
-    stacking_client->default_container()->set_id(
+    aura::RootWindow::GetInstance()->set_id(
         internal::kShellWindowId_DefaultContainer);
     activation_controller_.reset(new internal::ActivationController);
     activation_controller_->set_default_container_for_test(
-        stacking_client->default_container());
+        aura::RootWindow::GetInstance());
   }
   virtual ~WorkspaceManagerTestBase() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
     manager_.reset(new WorkspaceManager(viewport()));
   }
 
   virtual void TearDown() OVERRIDE {
     manager_.reset();
     aura::test::AuraTestBase::TearDown();
   }
 
   aura::Window* CreateTestWindow() {
     aura::Window* window = new aura::Window(NULL);
     window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     return window;
   }
 
   aura::Window* viewport() {
-    return GetTestStackingClient()->default_container();
+    return aura::RootWindow::GetInstance();
   }
   scoped_ptr<WorkspaceManager> manager_;
 
  private:
   scoped_ptr<internal::ActivationController> activation_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerTestBase);
 };
 
 class WorkspaceManagerTest : public WorkspaceManagerTestBase {
@@ skipping 440 matching lines @@
 
   w2->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_TRUE(ws->ContainsFullscreenWindow());
 
   w2->Hide();
   EXPECT_FALSE(ws->ContainsFullscreenWindow());
 }
 
 }  // namespace internal
 }  // namespace aura_shell