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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
-#include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
@@ skipping 23 matching lines @@
     : public extensions::PlatformAppBrowserTest {
  protected:
   LauncherPlatformAppBrowserTest()
       : launcher_(NULL),
         controller_(NULL) {
   }
 
   virtual ~LauncherPlatformAppBrowserTest() {}
 
   virtual void RunTestOnMainThreadLoop() {
-    launcher_ = ash::Shell::GetInstance()->launcher();
+    launcher_ = ash::Launcher::ForPrimaryDisplay();
     controller_ = static_cast<ChromeLauncherController*>(launcher_->delegate());
     return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
   }
 
   ash::LauncherID CreateAppShortcutLauncherItem(const std::string& name) {
     return controller_->CreateAppShortcutLauncherItem(
         name, controller_->model()->item_count());
   }
 
   ash::Launcher* launcher_;
   ChromeLauncherController* controller_;
 };
 
 class LauncherAppBrowserTest : public ExtensionBrowserTest {
  protected:
   LauncherAppBrowserTest()
       : launcher_(NULL),
         model_(NULL) {
   }
 
   virtual ~LauncherAppBrowserTest() {}
 
   virtual void RunTestOnMainThreadLoop() {
-    launcher_ = ash::Shell::GetInstance()->launcher();
+    launcher_ = ash::Launcher::ForPrimaryDisplay();
     model_ = launcher_->model();
     return ExtensionBrowserTest::RunTestOnMainThreadLoop();
   }
 
   const Extension* LoadAndLaunchExtension(
       const char* name,
       extension_misc::LaunchContainer container,
       WindowOpenDisposition disposition) {
     EXPECT_TRUE(LoadExtension(test_data_dir_.AppendASCII(name)));
 
@@ skipping 28 matching lines @@
     EXPECT_EQ(ash::TYPE_APP_SHORTCUT, item.type);
     return item.id;
   }
 
   ash::Launcher* launcher_;
   ash::LauncherModel* model_;
 };
 
 // Test that we can launch a platform app and get a running item.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, LaunchUnpinned) {
-  ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
+  ash::Launcher* launcher = ash::Launcher::ForPrimaryDisplay();
   int item_count = launcher->model()->item_count();
   const Extension* extension = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window = CreateShellWindow(extension);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
   ash::LauncherItem item =
       launcher->model()->items()[launcher->model()->item_count() - 2];
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
   CloseShellWindow(window);
@@ skipping 570 matching lines @@
 
   // Activating app should launch new tab, because second tab isn't
   // in its refocus url path.
   launcher_->ActivateLauncherItem(model_->ItemIndexByID(shortcut_id));
   EXPECT_EQ(++tab_count, tab_strip->count());
   TabContents* second_tab = tab_strip->GetActiveTabContents();
   EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(shortcut_id)->status);
   EXPECT_NE(first_tab, second_tab);
   EXPECT_EQ(tab_strip->GetActiveTabContents(), second_tab);
 }