[Download Notification] change notification type from SIMPLE to BASE_FORMAT

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/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
@@ skipping 366 matching lines @@
 
   // Waits for new notification.
   download_notification_remove_observer.Wait();
   download_notification_add_observer.Wait();
 
   // Checks strings.
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_DOWNLOAD_STATUS_DOWNLOADED_TITLE,
                 download_item()->GetFileNameToReportUser().LossyDisplayName()),
             GetNotification(notification_id())->title());
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id())->type());
 
   // Confirms that there is only one notification.
   message_center::NotificationList::Notifications
       visible_notifications = GetMessageCenter()->GetVisibleNotifications();
   EXPECT_EQ(1u, visible_notifications.size());
   EXPECT_TRUE(IsInNotifications(visible_notifications, notification_id()));
 
   // Opens the message center.
   GetMessageCenter()->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER);
@@ skipping 203 matching lines @@
   // Checks strings.
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_DOWNLOAD_STATUS_DOWNLOAD_FAILED_TITLE,
                 download_item()->GetFileNameToReportUser().LossyDisplayName()),
             GetNotification(notification_id())->title());
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_DOWNLOAD_STATUS_INTERRUPTED,
                 l10n_util::GetStringUTF16(
                     IDS_DOWNLOAD_INTERRUPTED_STATUS_NETWORK_ERROR)),
             GetNotification(notification_id())->message());
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id())->type());
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadNotificationTest,
                        InterruptDownloadAfterClosingNotification) {
   CreateDownload();
 
   // Closes the notification.
   NotificationRemoveObserver notification_close_observer;
   GetMessageCenter()->RemoveNotification(notification_id(), true /* by_user */);
@@ skipping 92 matching lines @@
       browser(), GURL(net::URLRequestSlowDownloadJob::kFinishDownloadUrl));
 
   // Waits for the completion of downloads.
   while (download1->GetState() != content::DownloadItem::COMPLETE ||
          download2->GetState() != content::DownloadItem::COMPLETE) {
     NotificationUpdateObserver download_change_notification_observer;
     download_change_notification_observer.Wait();
   }
 
   // Confirms the types of download notifications are correct.
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id1)->type());
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id2)->type());
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadNotificationTest, CancelDownload) {
   CreateDownload();
 
   // Opens the message center.
   GetMessageCenter()->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER);
 
   // Cancels the notification by clicking the "cancel' button.
@@ skipping 67 matching lines @@
   // Waits for download completion.
   while (download_item()->GetState() != content::DownloadItem::COMPLETE) {
     NotificationUpdateObserver download_change_notification_observer;
     download_change_notification_observer.Wait();
   }
 
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_DOWNLOAD_STATUS_DOWNLOADED_TITLE,
                 download_item()->GetFileNameToReportUser().LossyDisplayName()),
             GetNotification(notification_id())->title());
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id())->type());
 
   // Opens the message center.
   GetMessageCenter()->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER);
 
   // Try to open the downloaded item by clicking the notification.
   EXPECT_FALSE(GetIncognitoDownloadManagerDelegate()->opened());
   GetMessageCenter()->ClickOnNotification(notification_id());
   EXPECT_TRUE(GetIncognitoDownloadManagerDelegate()->opened());
   EXPECT_FALSE(GetDownloadManagerDelegate()->opened());
@@ skipping 59 matching lines @@
       browser(), GURL(net::URLRequestSlowDownloadJob::kFinishDownloadUrl));
 
   // Waits for the completion of downloads.
   while (download_normal->GetState() != content::DownloadItem::COMPLETE ||
          download_incognito->GetState() != content::DownloadItem::COMPLETE) {
     NotificationUpdateObserver download_change_notification_observer;
     download_change_notification_observer.Wait();
   }
 
   // Confirms the types of download notifications are correct.
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id1)->type());
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id2)->type());
 
   chrome::CloseWindow(incognito_browser());
 }
 
 //////////////////////////////////////////////////
 // Test with multi profiles
 //////////////////////////////////////////////////
 
 class MultiProfileDownloadNotificationTest
@@ skipping 130 matching lines @@
 
   // Waits for the completion of downloads.
   while (download1->GetState() != content::DownloadItem::COMPLETE ||
          download2->GetState() != content::DownloadItem::COMPLETE ||
          download3->GetState() != content::DownloadItem::COMPLETE) {
     NotificationUpdateObserver download_change_notification_observer;
     download_change_notification_observer.Wait();
   }
 
   // Confirms the types of download notifications are correct.
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id1)->type());
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id2)->type());
-  EXPECT_EQ(message_center::NOTIFICATION_TYPE_SIMPLE,
+  EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
             GetNotification(notification_id3)->type());
 }