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

ash/launcher/launcher_unittest.cc

Index: ash/launcher/launcher_unittest.cc
diff --git a/ash/launcher/launcher_unittest.cc b/ash/launcher/launcher_unittest.cc
index 3e21807df17cbf8b829bdc1cf8db30fe8e2185f6..cbf82291d53087037673a23095c63e94dc84bbc1 100644
--- a/ash/launcher/launcher_unittest.cc
+++ b/ash/launcher/launcher_unittest.cc
@@ -22,7 +22,7 @@ namespace ash {
 // Makes sure invoking SetStatusSize on the launcher changes the size of the
 // LauncherView.
 TEST_F(LauncherTest, SetStatusSize) {
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   LauncherView* launcher_view = launcher->GetLauncherViewForTest();
 
   gfx::Size launcher_size =
@@ -35,7 +35,7 @@ TEST_F(LauncherTest, SetStatusSize) {
 
 // Tests that the dimmer widget resizes itself as appropriate.
 TEST_F(LauncherTest, DimmerSize) {
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   launcher->SetDimsShelf(true);
 
   gfx::Size launcher_size =
@@ -54,7 +54,7 @@ TEST_F(LauncherTest, DimmerSize) {
 // Confirm that launching a browser gets the appropriate state reflected in
 // its button.
 TEST_F(LauncherTest, OpenBrowser) {
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   LauncherView* launcher_view = launcher->GetLauncherViewForTest();
   test::LauncherViewTestAPI test(launcher_view);