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

chrome/browser/download/notification/download_item_notification_unittest.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 "chrome/browser/download/notification/download_item_notification.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 17 matching lines @@
 
 namespace {
 
 const base::FilePath::CharType kDownloadItemTargetPathString[] =
     FILE_PATH_LITERAL("/tmp/TITLE.bin");
 
 }  // anonymouse namespace
 
 namespace test {
 
-class MockMessageCenter : public message_center::FakeMessageCenter {
- public:
-  MockMessageCenter() {}
-  ~MockMessageCenter() override {}
-
-  void AddVisibleNotification(message_center::Notification* notification) {
-    visible_notifications_.insert(notification);
-  }
-
-  const message_center::NotificationList::Notifications&
-      GetVisibleNotifications() override {
-    return visible_notifications_;
-  }
-
- private:
-  message_center::NotificationList::Notifications visible_notifications_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockMessageCenter);
-};
-
 class DownloadItemNotificationTest : public testing::Test {
  public:
   DownloadItemNotificationTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         profile_(nullptr) {}
 
   void SetUp() override {
     testing::Test::SetUp();
     message_center::MessageCenter::Initialize();
 
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
     profile_ = profile_manager_->CreateTestingProfile("test-user");
 
     scoped_ptr<NotificationUIManager> ui_manager(new StubNotificationUIManager);
     TestingBrowserProcess::GetGlobal()->
         SetNotificationUIManager(ui_manager.Pass());
 
     download_notification_manager_.reset(
         new DownloadNotificationManagerForProfile(profile_, nullptr));
 
-    message_center_.reset(new MockMessageCenter());
-    download_notification_manager_->OverrideMessageCenterForTest(
-        message_center_.get());
-
     base::FilePath download_item_target_path(kDownloadItemTargetPathString);
     download_item_.reset(new NiceMock<content::MockDownloadItem>());
     ON_CALL(*download_item_, GetId()).WillByDefault(Return(12345));
     ON_CALL(*download_item_, GetState())
         .WillByDefault(Return(content::DownloadItem::IN_PROGRESS));
     ON_CALL(*download_item_, IsDangerous()).WillByDefault(Return(false));
     ON_CALL(*download_item_, GetFileNameToReportUser())
         .WillByDefault(Return(base::FilePath("TITLE.bin")));
     ON_CALL(*download_item_, GetTargetFilePath())
         .WillByDefault(ReturnRefOfCopy(download_item_target_path));
@@ skipping 58 matching lines @@
   }
 
   bool ShownAsPopUp() {
     return !notification()->shown_as_popup();
   }
 
   void CreateDownloadItemNotification() {
     download_notification_manager_->OnNewDownloadReady(download_item_.get());
     download_item_notification_ =
         download_notification_manager_->items_[download_item_.get()];
-    message_center_->AddVisibleNotification(
-        download_item_notification_->notification_.get());
   }
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
 
   scoped_ptr<TestingProfileManager> profile_manager_;
   Profile* profile_;
 
   scoped_ptr<NiceMock<content::MockDownloadItem>> download_item_;
   scoped_ptr<DownloadNotificationManagerForProfile>
       download_notification_manager_;
-  scoped_ptr<MockMessageCenter> message_center_;
   DownloadItemNotification* download_item_notification_;
 };
 
 TEST_F(DownloadItemNotificationTest, ShowAndCloseNotification) {
   EXPECT_EQ(0u, NotificationCount());
 
   // Shows a notification
   CreateDownloadItemNotification();
   download_item_->NotifyObserversDownloadOpened();
 
@@ skipping 95 matching lines @@
   CreateDownloadItemNotification();
   download_item_->NotifyObserversDownloadOpened();
 
   EXPECT_EQ(message_center::DEFAULT_PRIORITY, notification()->priority());
 
   download_item_notification_->DisablePopup();
   EXPECT_EQ(message_center::LOW_PRIORITY, notification()->priority());
 }
 
 }  // namespace test