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

ui/message_center/popup_timer.h

 // Copyright (c) 2013 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.
 
 #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"
 #include "base/timer/timer.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_observer.h"
 #include "ui/message_center/message_center_types.h"
 #include "ui/message_center/notification_blocker.h"
 #include "ui/message_center/notifier_settings.h"
 
@@ skipping 89 matching lines @@
   void PauseTimer(const std::string& id);
 
   // Removes and cancels a single popup timer, if it exists.
   void CancelTimer(const std::string& id);
 
  private:
   // Weak, global.
   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);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_POPUP_TIMER_H_