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

ui/aura_shell/workspace_controller_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_controller.h"
 
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/test_stacking_client.h"
+#include "ui/aura/root_window.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/window_util.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
 
 namespace aura_shell {
 namespace internal {
 
 using aura::Window;
 
 class WorkspaceControllerTest : public aura::test::AuraTestBase {
  public:
   WorkspaceControllerTest() {}
   virtual ~WorkspaceControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
-    contents_view_ = GetTestStackingClient()->default_container();
+    contents_view_ = aura::RootWindow::GetInstance();
     // Activatable windows need to be in a container the ActivationController
     // recognizes.
     contents_view_->set_id(
         aura_shell::internal::kShellWindowId_DefaultContainer);
     activation_controller_.reset(new ActivationController);
     activation_controller_->set_default_container_for_test(contents_view_);
     controller_.reset(new WorkspaceController(contents_view_));
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 71 matching lines @@
   // The size of contents_view() for no workspace case must be
   // same as one contents_view() case.
   EXPECT_EQ("0,0 500x300", contents_view()->bounds().ToString());
 
   // Reset now before windows are destroyed.
   controller_.reset();
 }
 
 }  // namespace internal
 }  // namespace aura_shell