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

ash/system/web_notification/web_notification_tray.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 "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 120 matching lines @@
   if (message_center_bubble()) {
     UpdateTray();
     return;
   }
   // Indicate that the message center is visible. Clears the unread count.
   notification_list_->SetMessageCenterVisible(true);
   UpdateTray();
   HidePopupBubble();
   message_center_bubble_.reset(new MessageCenterBubble(this));
   status_area_widget()->SetHideSystemNotifications(true);
-  Shell::GetInstance()->shelf()->UpdateAutoHideState();
+  GetShelfLayoutManager()->UpdateAutoHideState();
 }
 
 void WebNotificationTray::HideMessageCenterBubble() {
   if (!message_center_bubble())
     return;
   message_center_bubble_.reset();
   show_message_center_on_unlock_ = false;
   notification_list_->SetMessageCenterVisible(false);
   UpdateTray();
   status_area_widget()->SetHideSystemNotifications(false);
-  Shell::GetInstance()->shelf()->UpdateAutoHideState();
+  GetShelfLayoutManager()->UpdateAutoHideState();
 }
 
 void WebNotificationTray::SetHidePopupBubble(bool hide) {
   if (hide)
     HidePopupBubble();
   else
     ShowPopupBubble();
 }
 
 void WebNotificationTray::ShowPopupBubble() {
@@ skipping 225 matching lines @@
   return message_center_bubble()->NumMessageViewsForTest();
 }
 
 size_t WebNotificationTray::GetPopupNotificationCountForTest() const {
   if (!popup_bubble())
     return 0;
   return popup_bubble()->NumMessageViewsForTest();
 }
 
 }  // namespace ash