[CrOS Tether] Remove notifications when they have been tapped.

chrome/browser/chromeos/net/tether_notification_presenter_unittest.cc

 // Copyright 2017 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/chromeos/net/tether_notification_presenter.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/observer_list.h"
@@ skipping 10 matching lines @@
 namespace tether {
 
 namespace {
 
 class TestMessageCenter : public message_center::FakeMessageCenter {
  public:
   TestMessageCenter() : message_center::FakeMessageCenter() {}
   ~TestMessageCenter() override {}
 
   void NotifyNotificationTapped(const std::string& notification_id) {
-    // Simulate the notification being removed, since a tap on the notification
-    // removes that notification.
-    RemoveNotification(notification_id, true /* by_user */);
-
     for (auto& observer : observer_list_) {
       observer.OnNotificationClicked(notification_id);
     }
   }
 
   void NotifyNotificationButtonTapped(const std::string& notification_id,
                                       int button_index) {
-    // Simulate the notification being removed, since a tap on a notification
-    // button removes that notification.
-    RemoveNotification(notification_id, true /* by_user */);
-
     for (auto& observer : observer_list_) {
       observer.OnNotificationButtonClicked(notification_id, button_index);
     }
   }
 
   size_t GetNumNotifications() { return notifications_.size(); }
 
   // message_center::FakeMessageCenter:
   void AddObserver(message_center::MessageCenterObserver* observer) override {
     observer_list_.AddObserver(observer);
@@ skipping 190 matching lines @@
 
   message_center::Notification* notification =
       test_message_center_->FindVisibleNotificationById(
           GetActiveHostNotificationId());
   EXPECT_TRUE(notification);
   EXPECT_EQ(GetActiveHostNotificationId(), notification->id());
 
   // Tap the notification.
   test_message_center_->NotifyNotificationTapped(GetActiveHostNotificationId());
   VerifySettingsOpened();
+  EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
+      GetActiveHostNotificationId()));
+  EXPECT_EQ(0u, test_message_center_->GetNumNotifications());
 }
 
 TEST_F(TetherNotificationPresenterTest, TestSetupRequiredNotification) {
   EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
       GetSetupRequiredNotificationId()));
   notification_presenter_->NotifySetupRequired(test_device_.name);
 
   message_center::Notification* notification =
       test_message_center_->FindVisibleNotificationById(
           GetSetupRequiredNotificationId());
@@ skipping 35 matching lines @@
   message_center::Notification* notification =
       test_message_center_->FindVisibleNotificationById(
           GetPotentialHotspotNotificationId());
   EXPECT_TRUE(notification);
   EXPECT_EQ(GetPotentialHotspotNotificationId(), notification->id());
 
   // Tap the notification.
   test_message_center_->NotifyNotificationTapped(
       GetPotentialHotspotNotificationId());
   VerifySettingsOpened();
+  EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
+      GetPotentialHotspotNotificationId()));
+  EXPECT_EQ(0u, test_message_center_->GetNumNotifications());
 }
 
 TEST_F(TetherNotificationPresenterTest,
        TestSinglePotentialHotspotNotification_TapNotificationButton) {
   EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
       GetPotentialHotspotNotificationId()));
   notification_presenter_->NotifyPotentialHotspotNearby(test_device_);
 
   message_center::Notification* notification =
       test_message_center_->FindVisibleNotificationById(
           GetPotentialHotspotNotificationId());
   EXPECT_TRUE(notification);
   EXPECT_EQ(GetPotentialHotspotNotificationId(), notification->id());
 
   // Tap the notification's button.
   test_message_center_->NotifyNotificationButtonTapped(
       GetPotentialHotspotNotificationId(), 0 /* button_index */);
+  EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
+      GetPotentialHotspotNotificationId()));
+  EXPECT_EQ(0u, test_message_center_->GetNumNotifications());
 
   EXPECT_EQ(test_device_.GetDeviceId(),
             test_network_connect_->network_id_to_connect());
 }
 
 TEST_F(TetherNotificationPresenterTest,
        TestMultiplePotentialHotspotNotification_RemoveProgrammatically) {
   EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
       GetPotentialHotspotNotificationId()));
   notification_presenter_->NotifyMultiplePotentialHotspotsNearby();
@@ skipping 20 matching lines @@
   message_center::Notification* notification =
       test_message_center_->FindVisibleNotificationById(
           GetPotentialHotspotNotificationId());
   EXPECT_TRUE(notification);
   EXPECT_EQ(GetPotentialHotspotNotificationId(), notification->id());
 
   // Tap the notification.
   test_message_center_->NotifyNotificationTapped(
       GetPotentialHotspotNotificationId());
   VerifySettingsOpened();
+  EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
+      GetPotentialHotspotNotificationId()));
+  EXPECT_EQ(0u, test_message_center_->GetNumNotifications());
 }
 
 TEST_F(TetherNotificationPresenterTest,
        TestPotentialHotspotNotifications_UpdatesOneNotification) {
   EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
       GetPotentialHotspotNotificationId()));
   notification_presenter_->NotifyPotentialHotspotNearby(test_device_);
 
   message_center::Notification* notification =
       test_message_center_->FindVisibleNotificationById(
@@ skipping 17 matching lines @@
   notification_presenter_->RemovePotentialHotspotNotification();
   EXPECT_FALSE(test_message_center_->FindVisibleNotificationById(
       GetPotentialHotspotNotificationId()));
 
   VerifySettingsNotOpened();
 }
 
 }  // namespace tether
 
 }  // namespace chromeos