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

ash/wm/panel_layout_manager_unittest.cc

Index: ash/wm/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panel_layout_manager_unittest.cc b/ash/wm/panel_layout_manager_unittest.cc
index f38ed9f4f2620a8c1c38e2929ea1bbf0d13c8e55..bcd9601f3f3a13b771b704b69e815623e92507fb 100644
--- a/ash/wm/panel_layout_manager_unittest.cc
+++ b/ash/wm/panel_layout_manager_unittest.cc
@@ -33,9 +33,8 @@ class PanelLayoutManagerTest : public ash::test::AshTestBase {
     ash::test::AshTestBase::SetUp();
     ASSERT_TRUE(ash::test::TestLauncherDelegate::instance());
 
-    Launcher* launcher = Shell::GetInstance()->launcher();
     launcher_view_test_.reset(new test::LauncherViewTestAPI(
-        launcher->GetLauncherViewForTest()));
+        Launcher::ForPrimaryDisplay()->GetLauncherViewForTest()));
     launcher_view_test_->SetAnimationDuration(1);
   }
 
@@ -79,7 +78,7 @@ class PanelLayoutManagerTest : public ash::test::AshTestBase {
     // Waits until all launcher view animations are done.
     launcher_view_test()->RunMessageLoopUntilAnimationsDone();
 
-    Launcher* launcher = Shell::GetInstance()->launcher();
+    Launcher* launcher = Launcher::ForPrimaryDisplay();
     gfx::Rect icon_bounds = launcher->GetScreenBoundsOfItemIconForWindow(panel);
     ASSERT_FALSE(icon_bounds.IsEmpty());