Remove Shell::shelf()|status_area_widget()|launcher()

ash/wm/workspace/workspace_layout_manager2_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_layout_manager2.h"
 
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/insets.h"
 
@@ skipping 41 matching lines @@
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) {
     if (!window_)
       return;
 
     if (wm::IsWindowMaximized(window)) {
       aura::Window* w = window_;
       window_ = NULL;
 
-      gfx::Rect shelf_bounds(Shell::GetInstance()->shelf()->GetIdealBounds());
+      gfx::Rect shelf_bounds(
+          Shell::GetPrimaryRootWindowController()->shelf()->GetIdealBounds());
       const gfx::Rect& window_bounds(w->bounds());
       w->SetBounds(gfx::Rect(window_bounds.x(), shelf_bounds.y() - 1,
                              window_bounds.width(), window_bounds.height()));
     }
   }
 
  private:
   aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(DontClobberRestoreBoundsWindowObserver);
@@ skipping 51 matching lines @@
   window_bounds.Offset(root_window_bounds.width(), root_window_bounds.height());
   ASSERT_FALSE(window_bounds.Intersects(root_window_bounds));
   scoped_ptr<aura::Window> out_window(CreateTestWindow(window_bounds));
   EXPECT_EQ(window_bounds.size(), out_window->bounds().size());
   EXPECT_TRUE(out_window->bounds().Intersects(root_window_bounds));
 }
 
 }  // namespace
 
 }  // namespace ash