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

ash/wm/workspace/workspace_layout_manager2_unittest.cc

Index: ash/wm/workspace/workspace_layout_manager2_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager2_unittest.cc b/ash/wm/workspace/workspace_layout_manager2_unittest.cc
index 59cab50ed8e5550ac3c77b824963fad06af2ab6a..18af7bc7d0690dfbd199aca2db6c6494b0c269fa 100644
--- a/ash/wm/workspace/workspace_layout_manager2_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager2_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/workspace/workspace_layout_manager.h"
 
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
@@ -65,7 +66,8 @@ class DontClobberRestoreBoundsWindowObserver : public aura::WindowObserver {
       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()));