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

ash/focus_cycler_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/focus_cycler.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
@@ skipping 50 matching lines @@
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
   scoped_ptr<SystemTray> tray(CreateSystemTray());
   ASSERT_TRUE(tray->GetWidget());
   focus_cycler->AddWidget(tray->GetWidget());
   GetStatusAreaWidgetDelegate(tray->GetWidget())->SetFocusCyclerForTesting(
       focus_cycler.get());
 
   // Add the launcher
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
@@ skipping 14 matching lines @@
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
   scoped_ptr<SystemTray> tray(CreateSystemTray());
   ASSERT_TRUE(tray->GetWidget());
   focus_cycler->AddWidget(tray->GetWidget());
   GetStatusAreaWidgetDelegate(tray->GetWidget())->SetFocusCyclerForTesting(
       focus_cycler.get());
 
   // Add the launcher
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
@@ skipping 14 matching lines @@
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
   scoped_ptr<SystemTray> tray(CreateSystemTray());
   ASSERT_TRUE(tray->GetWidget());
   focus_cycler->AddWidget(tray->GetWidget());
   GetStatusAreaWidgetDelegate(tray->GetWidget())->SetFocusCyclerForTesting(
       focus_cycler.get());
 
   // Add the launcher
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
@@ skipping 26 matching lines @@
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
   scoped_ptr<SystemTray> tray(CreateSystemTray());
   ASSERT_TRUE(tray->GetWidget());
   focus_cycler->AddWidget(tray->GetWidget());
   GetStatusAreaWidgetDelegate(tray->GetWidget())->SetFocusCyclerForTesting(
       focus_cycler.get());
 
   // Add the launcher and focus it
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
   focus_cycler->FocusWidget(launcher_widget);
 
   // Cycle focus to the status area
   focus_cycler->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray->GetWidget()->IsActive());
 
@@ skipping 16 matching lines @@
 
 class FocusCyclerLauncherTest : public AshTestBase {
  public:
   FocusCyclerLauncherTest() : AshTestBase() {}
   virtual ~FocusCyclerLauncherTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
 
     // Hide the launcher
-    Launcher* launcher = Shell::GetInstance()->launcher();
+    Launcher* launcher = Launcher::ForPrimaryDisplay();
     ASSERT_TRUE(launcher);
     views::Widget* launcher_widget = launcher->widget();
     ASSERT_TRUE(launcher_widget);
     launcher_widget->Hide();
   }
 
   virtual void TearDown() OVERRIDE {
     // Show the launcher
-    Launcher* launcher = Shell::GetInstance()->launcher();
+    Launcher* launcher = Launcher::ForPrimaryDisplay();
     ASSERT_TRUE(launcher);
     views::Widget* launcher_widget = launcher->widget();
     ASSERT_TRUE(launcher_widget);
     launcher_widget->Show();
 
     AshTestBase::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FocusCyclerLauncherTest);
 };
 
 TEST_F(FocusCyclerLauncherTest, CycleFocusForwardInvisible) {
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
   scoped_ptr<SystemTray> tray(CreateSystemTray());
   ASSERT_TRUE(tray->GetWidget());
   focus_cycler->AddWidget(tray->GetWidget());
   GetStatusAreaWidgetDelegate(tray->GetWidget())->SetFocusCyclerForTesting(
       focus_cycler.get());
 
   // Add the launcher
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
@@ skipping 10 matching lines @@
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
   scoped_ptr<SystemTray> tray(CreateSystemTray());
   ASSERT_TRUE(tray->GetWidget());
   focus_cycler->AddWidget(tray->GetWidget());
   GetStatusAreaWidgetDelegate(tray->GetWidget())->SetFocusCyclerForTesting(
       focus_cycler.get());
 
   // Add the launcher
-  Launcher* launcher = Shell::GetInstance()->launcher();
+  Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area
   focus_cycler->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace test
 }  // namespace ash