ScopedPtrMap -> std::map from apps, ash, media, ui

ui/message_center/popup_timer.cc

 // Copyright (c) 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 "ui/message_center/popup_timer.h"
 
 #include <algorithm>
 
+#include "base/stl_util.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_types.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 
 namespace message_center {
 
 namespace {
 
 base::TimeDelta GetTimeoutForNotification(Notification* notification) {
@@ skipping 67 matching lines @@
   PopupTimerCollection::const_iterator iter = popup_timers_.find(id);
   if (iter != popup_timers_.end()) {
     DCHECK(iter->second);
     iter->second->Start();
     return;
   }
 
   scoped_ptr<PopupTimer> timer(new PopupTimer(id, timeout, AsWeakPtr()));
 
   timer->Start();
-  popup_timers_.insert(id, timer.Pass());
+  popup_timers_.insert(std::make_pair(id, std::move(timer)));
 }
 
 void PopupTimersController::StartAll() {
-  for (auto& iter : popup_timers_)
+  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 (auto& iter : popup_timers_)
+  for (const auto& iter : popup_timers_)
     iter.second->Pause();
 }
 
 void PopupTimersController::CancelTimer(const std::string& id) {
   popup_timers_.erase(id);
 }
 
 void PopupTimersController::CancelAll() {
   popup_timers_.clear();
 }
@@ skipping 37 matching lines @@
   if (popup_timers_.find(id) == popup_timers_.end())
     StartTimer(id, GetTimeoutForNotification(*iter));
 }
 
 void PopupTimersController::OnNotificationRemoved(const std::string& id,
                                                   bool by_user) {
   CancelTimer(id);
 }
 
 }  // namespace message_center