Revert of Update first download notification correctly if there are multiple notifications

chrome/browser/download/notification/download_notification_browsertest.cc

 // Copyright 2015 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 "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 356 matching lines @@
 IN_PROC_BROWSER_TEST_F(DownloadNotificationTest, DownloadFile) {
   CreateDownload();
 
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_DOWNLOAD_STATUS_IN_PROGRESS_TITLE,
                 download_item()->GetFileNameToReportUser().LossyDisplayName()),
             GetNotification(notification_id())->title());
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_PROGRESS,
             GetNotification(notification_id())->type());
 
-  // Confirms that the download update is delivered to the notification.
-  NotificationUpdateObserver download_notification_periodically_update_observer;
-  download_item()->UpdateObservers();
-  download_notification_periodically_update_observer.Wait();
-
   NotificationUpdateObserver download_notification_update_observer;
 
   // Requests to complete the download.
   ui_test_utils::NavigateToURL(
       browser(), GURL(net::URLRequestSlowDownloadJob::kFinishDownloadUrl));
 
   // Waits for download completion.
   while (download_item()->GetState() != content::DownloadItem::COMPLETE) {
     NotificationUpdateObserver download_change_notification_observer;
     download_change_notification_observer.Wait();
@@ skipping 390 matching lines @@
   EXPECT_EQ(1u, popup_notifications.size());
   EXPECT_FALSE(IsInNotifications(popup_notifications, notification_id1));
   EXPECT_TRUE(IsInNotifications(popup_notifications, notification_id2));
 
   // Confirms that the old one is low priority, and the new one is default.
   EXPECT_EQ(message_center::LOW_PRIORITY,
             GetNotification(notification_id1)->priority());
   EXPECT_EQ(message_center::DEFAULT_PRIORITY,
             GetNotification(notification_id2)->priority());
 
-  // Confirms that the updates of both download are delivered to the
-  // notifications.
-  NotificationUpdateObserver notification_periodically_update_observer1;
-  download1->UpdateObservers();
-  EXPECT_EQ(notification_id1,
-            notification_periodically_update_observer1.Wait());
-  NotificationUpdateObserver notification_periodically_update_observer2;
-  download2->UpdateObservers();
-  EXPECT_EQ(notification_id2,
-            notification_periodically_update_observer2.Wait());
-
   // Requests to complete the downloads.
   ui_test_utils::NavigateToURL(
       browser(), GURL(net::URLRequestSlowDownloadJob::kFinishDownloadUrl));
 
   // Waits for the completion of downloads.
   NotificationUpdateObserver download_change_notification_observer;
   while (download1->GetState() != content::DownloadItem::COMPLETE ||
          download2->GetState() != content::DownloadItem::COMPLETE) {
     download_change_notification_observer.Wait();
   }
@@ skipping 422 matching lines @@
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user1)->type());
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user2_1)->type());
   // Normal notifications for user2.
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user2_1)->type());
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id_user2_2)->type());
 }