[Merge to M58] CrOS: Do not allow notifications to be added during shutdown.

chrome/browser/notifications/message_center_notification_manager.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 "chrome/browser/notifications/message_center_notification_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 64 matching lines @@
   message_center_->RemoveObserver(this);
 
   profile_notifications_.clear();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NotificationUIManager
 
 void MessageCenterNotificationManager::Add(const Notification& notification,
                                            Profile* profile) {
+  // We won't have time to process and act on this notification.
+  if (is_shutdown_started_)
+    return;
+
   if (Update(notification, profile))
     return;
 
   std::unique_ptr<ProfileNotification> profile_notification_ptr =
       base::MakeUnique<ProfileNotification>(profile, notification);
   ProfileNotification* profile_notification = profile_notification_ptr.get();
 
   ExtensionWelcomeNotificationFactory::GetForBrowserContext(profile)->
       ShowWelcomeNotificationIfNecessary(profile_notification->notification());
 
@@ skipping 157 matching lines @@
     }
   }
   return removed;
 }
 
 void MessageCenterNotificationManager::CancelAll() {
   message_center_->RemoveAllNotifications(
       false /* by_user */, message_center::MessageCenter::RemoveType::ALL);
 }
 
+void MessageCenterNotificationManager::StartShutdown() {
+  is_shutdown_started_ = true;
+  CancelAll();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // MessageCenter::Observer
 void MessageCenterNotificationManager::OnNotificationRemoved(
     const std::string& id,
     bool by_user) {
   auto iter = profile_notifications_.find(id);
   if (iter != profile_notifications_.end())
     RemoveProfileNotification(iter->first);
 }
 
@@ skipping 66 matching lines @@
 }
 
 ProfileNotification* MessageCenterNotificationManager::FindProfileNotification(
     const std::string& id) const {
   auto iter = profile_notifications_.find(id);
   if (iter == profile_notifications_.end())
     return nullptr;
 
   return (*iter).second.get();
 }