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

ash/launcher/launcher_tooltip_manager_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/launcher/launcher_tooltip_manager.h"
 
+#include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 
 class LauncherTooltipManagerTest : public AshTestBase {
  public:
   LauncherTooltipManagerTest() {}
   virtual ~LauncherTooltipManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
-
+    internal::RootWindowController* controller =
+        Shell::GetPrimaryRootWindowController();
     tooltip_manager_.reset(new internal::LauncherTooltipManager(
         SHELF_ALIGNMENT_BOTTOM,
-        Shell::GetInstance()->shelf(),
-        Shell::GetInstance()->launcher()->GetLauncherViewForTest()));
+        controller->shelf(),
+        controller->launcher()->GetLauncherViewForTest()));
   }
 
   virtual void TearDown() OVERRIDE {
     tooltip_manager_.reset();
     AshTestBase::TearDown();
   }
 
   void ShowDelayed() {
     dummy_anchor_.reset(new views::View);
     tooltip_manager_->ShowDelayed(dummy_anchor_.get(), string16());
@@ skipping 45 matching lines @@
 
   // Create a full-screen window to hide the shelf.
   scoped_ptr<views::Widget> widget(new views::Widget);
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
   widget->SetFullscreen(true);
   widget->Show();
 
   // Once the shelf is hidden, the tooltip should be invisible.
-  ASSERT_EQ(internal::ShelfLayoutManager::HIDDEN,
-            Shell::GetInstance()->shelf()->visibility_state());
+  ASSERT_EQ(
+      internal::ShelfLayoutManager::HIDDEN,
+      Shell::GetPrimaryRootWindowController()->shelf()->visibility_state());
   EXPECT_FALSE(TooltipIsVisible());
 
   // Do not show the view if the shelf is hidden.
   ShowImmediately();
   EXPECT_FALSE(TooltipIsVisible());
 
   // ShowDelayed() doesn't even start the timer for the hidden shelf.
   ShowDelayed();
   EXPECT_FALSE(IsTimerRunning());
 }
 
 TEST_F(LauncherTooltipManagerTest, HideWhenShelfIsAutoHide) {
   ShowImmediately();
   ASSERT_TRUE(TooltipIsVisible());
 
-  internal::ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
+  internal::ShelfLayoutManager* shelf =
+      Shell::GetPrimaryRootWindowController()->shelf();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   shelf->UpdateAutoHideState();
   ASSERT_EQ(internal::ShelfLayoutManager::AUTO_HIDE_HIDDEN,
             shelf->auto_hide_state());
 
   // Tooltip visibility change for auto hide may take time.
   EXPECT_TRUE(TooltipIsVisible());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 
@@ skipping 64 matching lines @@
 
   // Should hide if the mouse is out of the tooltip.
   test_api.set_location(tooltip_rect.origin().Add(gfx::Point(-1, -1)));
   EXPECT_FALSE(event_filter->PreHandleMouseEvent(root_window, &mouse_event));
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 }
 
 }  // namespace test
 }  // namespace ash