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

ui/message_center/popup_timer.h

Index: ui/message_center/popup_timer.h
diff --git a/ui/message_center/popup_timer.h b/ui/message_center/popup_timer.h
index f730732424677abf67cf00d7dde1c77a01028c8c..a822ca80e37c5c5dc68a0c116dc75092387bbb3c 100644
--- a/ui/message_center/popup_timer.h
+++ b/ui/message_center/popup_timer.h
@@ -5,10 +5,10 @@
 #ifndef UI_MESSAGE_CENTER_POPUP_TIMER_H_
 #define UI_MESSAGE_CENTER_POPUP_TIMER_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
-#include "base/containers/scoped_ptr_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ -118,8 +118,7 @@ class MESSAGE_CENTER_EXPORT PopupTimersController
   MessageCenter* message_center_;
 
   // The PopupTimerCollection contains all the managed timers by their ID.
-  typedef base::ScopedPtrMap<std::string, scoped_ptr<PopupTimer>>
-      PopupTimerCollection;
+  using PopupTimerCollection = std::map<std::string, scoped_ptr<PopupTimer>>;
   PopupTimerCollection popup_timers_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupTimersController);