Update usages of std::map to use ScopedPtrMap.

ui/message_center/message_center_impl.cc

 // 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.
 
 #include "ui/message_center/message_center_impl.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
@@ skipping 324 matching lines @@
 void PopupTimer::Reset() {
   if (timer_)
     timer_->Stop();
   passed_ = base::TimeDelta();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PopupTimersController
 
 PopupTimersController::PopupTimersController(MessageCenter* message_center)
-    : message_center_(message_center), popup_deleter_(&popup_timers_) {
+    : message_center_(message_center) {
   message_center_->AddObserver(this);
 }
 
 PopupTimersController::~PopupTimersController() {
   message_center_->RemoveObserver(this);
 }
 
 void PopupTimersController::StartTimer(const std::string& id,
                                        const base::TimeDelta& timeout) {
-  PopupTimerCollection::iterator iter = popup_timers_.find(id);
+  PopupTimerCollection::const_iterator iter = popup_timers_.find(id);
   if (iter != popup_timers_.end()) {
     DCHECK(iter->second);
     iter->second->Start();
     return;
   }
 
-  PopupTimer* timer = new PopupTimer(id, timeout, AsWeakPtr());
+  scoped_ptr<PopupTimer> timer(new PopupTimer(id, timeout, AsWeakPtr()));
 
   timer->Start();
-  popup_timers_[id] = timer;
+  popup_timers_.insert(id, timer.Pass());
 }
 
 void PopupTimersController::StartAll() {
   for (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::iterator iter = popup_timers_.find(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_)
     iter.second->Pause();
 }
 
 void PopupTimersController::CancelTimer(const std::string& id) {
-  PopupTimerCollection::iterator iter = popup_timers_.find(id);
-  if (iter == popup_timers_.end())
-    return;
-
-  delete iter->second;
-  popup_timers_.erase(iter);
+  popup_timers_.erase(id);
 }
 
 void PopupTimersController::CancelAll() {
-  STLDeleteValues(&popup_timers_);
+  popup_timers_.clear();
 }
 
 void PopupTimersController::TimerFinished(const std::string& id) {
   if (!ContainsKey(popup_timers_, id))
     return;
 
   CancelTimer(id);
   message_center_->MarkSinglePopupAsShown(id, false);
 }
 
@@ skipping 527 matching lines @@
 void MessageCenterImpl::PausePopupTimers() {
   if (popup_timers_controller_)
     popup_timers_controller_->PauseAll();
 }
 
 void MessageCenterImpl::DisableTimersForTest() {
   popup_timers_controller_.reset();
 }
 
 }  // namespace message_center