Reset popup dismissal timers when replacing a notification.

ui/message_center/popup_timers_controller.cc

 // Copyright 2016 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 "ui/message_center/popup_timers_controller.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "ui/message_center/message_center_style.h"
@@ skipping 34 matching lines @@
 
   timer->Start();
   popup_timers_.insert(std::make_pair(id, std::move(timer)));
 }
 
 void PopupTimersController::StartAll() {
   for (const auto& iter : popup_timers_)
     iter.second->Start();
 }
 
-void PopupTimersController::ResetTimer(const std::string& id,
-                                       const base::TimeDelta& timeout) {
-  CancelTimer(id);
-  StartTimer(id, timeout);
-}
-
-void PopupTimersController::PauseTimer(const std::string& id) {
-  PopupTimerCollection::const_iterator iter = popup_timers_.find(id);
-  if (iter == popup_timers_.end())
-    return;
-  iter->second->Pause();
-}
-
 void PopupTimersController::PauseAll() {
   for (const auto& iter : popup_timers_)
     iter.second->Pause();
 }
 
 void PopupTimersController::CancelTimer(const std::string& id) {
   popup_timers_.erase(id);
 }
 
 void PopupTimersController::CancelAll() {
@@ skipping 28 matching lines @@
   for (; iter != popup_notifications.end(); ++iter) {
     if ((*iter)->id() == id)
       break;
   }
 
   if (iter == popup_notifications.end() || (*iter)->never_timeout()) {
     CancelTimer(id);
     return;
   }
 
-  // Start the timer if not yet.
-  if (popup_timers_.find(id) == popup_timers_.end())
-    StartTimer(id, GetTimeoutForNotification(*iter));
+  CancelTimer(id);
+  StartTimer(id, GetTimeoutForNotification(*iter));
 }
 
 void PopupTimersController::OnNotificationRemoved(const std::string& id,
                                                   bool by_user) {
   CancelTimer(id);
 }
 
 }  // namespace message_center