Refactor: Shelf Widget

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/shelf/shelf_widget.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/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/message_center_bubble.h"
 #include "ui/message_center/views/message_popup_bubble.h"
 #include "ui/message_center/views/message_popup_collection.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"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
 
 namespace {
 
 WebNotificationTray* GetWebNotificationTray() {
-  return Shell::GetPrimaryRootWindowController()->status_area_widget()->
-      web_notification_tray();
+  return Shell::GetPrimaryRootWindowController()->shelf()->
+      status_area_widget()->web_notification_tray();
 }
 
 message_center::MessageCenter* get_message_center() {
   return GetWebNotificationTray()->message_center();
 }
 
 class TestDelegate : public message_center::MessageCenter::Delegate {
  public:
   TestDelegate(message_center::MessageCenter* message_center)
     : message_center_(message_center) {
@@ skipping 181 matching lines @@
     EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications, popups.size());
   } else {
     EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
               tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
   }
   get_message_center()->SetDelegate(NULL);
   get_message_center()->notification_list()->RemoveAllNotifications();
 }
 
 }  // namespace ash