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

ui/message_center/popup_timer.cc

Index: ui/message_center/popup_timer.cc
diff --git a/ui/message_center/popup_timer.cc b/ui/message_center/popup_timer.cc
index dc27866b60b0d3699bfb9b600b4a3467ab8631a3..f19da62e8dfff631507e6abfea8d19c125a22df3 100644
--- a/ui/message_center/popup_timer.cc
+++ b/ui/message_center/popup_timer.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -93,11 +94,11 @@ void PopupTimersController::StartTimer(const std::string& id,
   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();
 }
 
@@ -115,7 +116,7 @@ void PopupTimersController::PauseTimer(const std::string& id) {
 }
 
 void PopupTimersController::PauseAll() {
-  for (auto& iter : popup_timers_)
+  for (const auto& iter : popup_timers_)
     iter.second->Pause();
 }