Update usages of std::map to use ScopedPtrMap.

ui/message_center/message_center_impl.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_MESSAGE_CENTER_IMPL_H_
 #define UI_MESSAGE_CENTER_MESSAGE_CENTER_IMPL_H_
 
 #include <string>
 #include <vector>
 
+#include "base/containers/scoped_ptr_map.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "base/stl_util.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"
 
 namespace message_center {
 class NotificationDelegate;
@@ skipping 91 matching lines @@
   // call to StartAll or StartTimer.
   void PauseTimer(const std::string& id);
 
   // Removes and cancels a single popup timer, if it exists.
   void CancelTimer(const std::string& id);
 
  private:
   // Weak, this class is owned by MessageCenterImpl.
   MessageCenter* message_center_;
 
-  // The PopupTimerCollection contains all the managed timers by their ID.  They
-  // are owned by this class, and deleted by |popup_deleter_| on destructon or
-  // when explicitly cancelled.
-  typedef std::map<std::string, PopupTimer*> PopupTimerCollection;
+  // The PopupTimerCollection contains all the managed timers by their ID.
+  typedef base::ScopedPtrMap<std::string, scoped_ptr<PopupTimer>>
+      PopupTimerCollection;
   PopupTimerCollection popup_timers_;
-  STLValueDeleter<PopupTimerCollection> popup_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupTimersController);
 };
 
 }  // namespace internal
 
 // The default implementation of MessageCenter.
 class MessageCenterImpl : public MessageCenter,
                           public NotificationBlocker::Observer,
                           public message_center::NotifierSettingsObserver {
@@ skipping 83 matching lines @@
   // Queue for the notifications to delay the addition/updates when the message
   // center is visible.
   scoped_ptr<internal::ChangeQueue> notification_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterImpl);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_MESSAGE_CENTER_H_