Stop notification updates from unpausing toast timers.

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 82 matching lines @@
   for (; iter != popup_notifications.end(); ++iter) {
     if ((*iter)->id() == id)
       break;
   }
 
   if (iter == popup_notifications.end() || (*iter)->never_timeout()) {
     CancelTimer(id);
     return;
   }
 
+  auto timer = popup_timers_.find(id);
+  // The timer must already have been started and not be running. Relies on
+  // the invariant that |popup_timers_| only contains timers that have been
+  // started.
+  bool was_paused = timer != popup_timers_.end() && !timer->second->IsRunning();
   CancelTimer(id);
   StartTimer(id, GetTimeoutForNotification(*iter));
+
+  // If a timer was paused before, pause it afterwards as well.
+  // See crbug.com/710298
+  if (was_paused) {
+    auto timer = popup_timers_.find(id);
+    timer->second->Pause();
+  }
 }
 
 void PopupTimersController::OnNotificationRemoved(const std::string& id,
                                                   bool by_user) {
   CancelTimer(id);
 }
 
 }  // namespace message_center