Made notification center notifications collapsed and expandable.

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"
@@ skipping 56 matching lines @@
 
   virtual void ShowSettings(const std::string& notifcation_id) OVERRIDE {
   }
 
   virtual void ShowSettingsDialog(gfx::NativeView context) OVERRIDE {
   }
 
   virtual void OnClicked(const std::string& notifcation_id) OVERRIDE {
   }
 
+  virtual void OnButtonClicked(const std::string& id,
+                               int button_index) OVERRIDE {
+  }
+
   void AddNotification(WebNotificationTray* tray, const std::string& id) {
     notification_ids_.insert(id);
     get_message_center()->AddNotification(
         message_center::NOTIFICATION_TYPE_SIMPLE,
         id,
         ASCIIToUTF16("Test Web Notification"),
         ASCIIToUTF16("Notification message body."),
         ASCIIToUTF16("www.test.org"),
         "" /* extension id */,
         NULL /* optional_fields */);
@@ skipping 128 matching lines @@
     std::string id = StringPrintf("test_id%d", static_cast<int>(i));
     delegate->AddNotification(tray, id);
   }
   // Hide and reshow the bubble so that it is updated immediately, not delayed.
   tray->SetHidePopupBubble(true);
   tray->SetHidePopupBubble(false);
   EXPECT_TRUE(tray->IsPopupVisible());
   EXPECT_EQ(notifications_to_add,
             get_message_center()->NotificationCount());
   if (message_center::IsRichNotificationEnabled()) {
-    NotificationList::Delegate* list_delegate =
-        tray->popup_collection_.get()->list_delegate_;
     NotificationList::PopupNotifications popups =
-        list_delegate->GetNotificationList()->GetPopupNotifications();
+        get_message_center()->notification_list()->GetPopupNotifications();
     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