Add WorkspaceObserver to observe changes in workspace state

ui/aura_shell/default_container_layout_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/default_container_layout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/aura/aura_constants.h"
@@ skipping 10 matching lines @@
 namespace aura_shell {
 namespace test {
 
 namespace {
 
 using views::Widget;
 using aura_shell::internal::DefaultContainerLayoutManager;
 
 class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
  public:
-  DefaultContainerLayoutManagerTest() {}
+  DefaultContainerLayoutManagerTest() : layout_manager_(NULL) {}
   virtual ~DefaultContainerLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
     aura::Desktop* desktop = aura::Desktop::GetInstance();
     container_.reset(
         CreateTestWindow(gfx::Rect(0, 0, 500, 400), desktop));
     workspace_controller_.reset(
-        new internal::WorkspaceController(container_.get()));
+        new aura_shell::internal::WorkspaceController(container_.get()));
+    layout_manager_ = new DefaultContainerLayoutManager(
+        workspace_controller_->workspace_manager());
+    container_->SetLayoutManager(layout_manager_);
 
     desktop->SetHostSize(gfx::Size(500, 400));
   }
 
   aura::Window* CreateTestWindowWithType(const gfx::Rect& bounds,
                                          aura::Window* parent,
                                          aura::WindowType type) {
     aura::Window* window = new aura::Window(NULL);
     window->SetType(type);
     window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     window->SetBounds(bounds);
     window->Show();
     window->SetParent(parent);
     return window;
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds,
                                  aura::Window* parent) {
     return CreateTestWindowWithType(bounds,
                                     parent,
                                     aura::WINDOW_TYPE_NORMAL);
   }
 
   aura::Window* container() { return container_.get(); }
 
   DefaultContainerLayoutManager* default_container_layout_manager() {
-    return workspace_controller_->layout_manager();
+    return layout_manager_;
   }
 
  protected:
   aura_shell::internal::WorkspaceManager* workspace_manager() {
-    return workspace_controller_->layout_manager()->workspace_manager();
+    return workspace_controller_->workspace_manager();
   }
 
  private:
   scoped_ptr<aura::Window> container_;
   scoped_ptr<aura_shell::internal::WorkspaceController> workspace_controller_;
+  // LayoutManager is owned by |container|.
+  aura_shell::internal::DefaultContainerLayoutManager* layout_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultContainerLayoutManagerTest);
 };
 
 // Utility functions to set and get show state on |window|.
 void Maximize(aura::Window* window) {
   window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
@@ skipping 242 matching lines @@
 
   Restore(w1.get());
   // The following test does not pass due to crbug.com/102413.
   // TODO(oshima): Re-enable this once the bug is fixed.
   // EXPECT_EQ(window_bounds.size().ToString(),
   //           w1->GetTargetBounds().size().ToString());
 }
 
 }  // namespace test
 }  // namespace aura_shell