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

ash/system/web_notification/web_notification_tray_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/system/web_notification/web_notification_tray.h"
 
 #include <vector>
 
+#include "ash/root_window_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/ash_test_base.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 WebNotificationTray* GetWebNotificationTray() {
-  return Shell::GetInstance()->status_area_widget()->web_notification_tray();
+  return Shell::GetPrimaryRootWindowController()->status_area_widget()->
+      web_notification_tray();
 }
 
 class TestDelegate : public WebNotificationTray::Delegate {
  public:
   TestDelegate() {}
   virtual ~TestDelegate() {}
 
   // WebNotificationTray::Delegate overrides.
   virtual void NotificationRemoved(const std::string& notifcation_id) {
     notification_ids_.erase(notifcation_id);
@@ skipping 146 matching lines @@
   // Hide and reshow the bubble so that it is updated immediately, not delayed.
   tray->HidePopupBubble();
   tray->ShowPopupBubble();
   EXPECT_TRUE(tray->popup_bubble() != NULL);
   EXPECT_EQ(notifications_to_add, tray->GetNotificationCountForTest());
   EXPECT_EQ(WebNotificationTray::kMaxVisiblePopupNotifications,
             tray->GetPopupNotificationCountForTest());
 }
 
 }  // namespace ash