Remove stl_util's STLDeleteContainerPairSecondPointers.

components/syncable_prefs/pref_model_associator.cc

 // Copyright (c) 2012 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 "components/syncable_prefs/pref_model_associator.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync/api/sync_change.h"
 #include "components/sync/api/sync_error_factory.h"
 #include "components/sync/protocol/preference_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/syncable_prefs/pref_model_associator_client.h"
 #include "components/syncable_prefs/pref_service_syncable.h"
 
@@ skipping 37 matching lines @@
       type_(type),
       client_(client) {
   DCHECK(CalledOnValidThread());
   DCHECK(type_ == PREFERENCES || type_ == PRIORITY_PREFERENCES);
 }
 
 PrefModelAssociator::~PrefModelAssociator() {
   DCHECK(CalledOnValidThread());
   pref_service_ = NULL;
 
-  base::STLDeleteContainerPairSecondPointers(synced_pref_observers_.begin(),
-                                             synced_pref_observers_.end());
   synced_pref_observers_.clear();
 }
 
 void PrefModelAssociator::InitPrefAndAssociate(
     const syncer::SyncData& sync_pref,
     const std::string& pref_name,
     syncer::SyncChangeList* sync_changes) {
   const base::Value* user_pref_value = pref_service_->GetUserPrefValue(
       pref_name.c_str());
   VLOG(1) << "Associating preference " << pref_name;
@@ skipping 350 matching lines @@
   }
   return value.release();
 }
 
 bool PrefModelAssociator::IsPrefSynced(const std::string& name) const {
   return synced_preferences_.find(name) != synced_preferences_.end();
 }
 
 void PrefModelAssociator::AddSyncedPrefObserver(const std::string& name,
     SyncedPrefObserver* observer) {
-  SyncedPrefObserverList* observers = synced_pref_observers_[name];
-  if (observers == NULL) {
-    observers = new SyncedPrefObserverList;
-    synced_pref_observers_[name] = observers;
-  }
+  std::unique_ptr<SyncedPrefObserverList>& observers =
+      synced_pref_observers_[name];
+  if (!observers)
+    observers = base::MakeUnique<SyncedPrefObserverList>();
+
   observers->AddObserver(observer);
 }
 
 void PrefModelAssociator::RemoveSyncedPrefObserver(const std::string& name,
     SyncedPrefObserver* observer) {
-  SyncedPrefObserverMap::iterator observer_iter =
-      synced_pref_observers_.find(name);
+  auto observer_iter = synced_pref_observers_.find(name);
   if (observer_iter == synced_pref_observers_.end())
     return;
-  SyncedPrefObserverList* observers = observer_iter->second;
+  SyncedPrefObserverList* observers = observer_iter->second.get();
   observers->RemoveObserver(observer);
 }
 
 void PrefModelAssociator::SetPrefModelAssociatorClientForTesting(
     const PrefModelAssociatorClient* client) {
   DCHECK(!client_);
   client_ = client;
 }
 
 std::set<std::string> PrefModelAssociator::registered_preferences() const {
@@ skipping 61 matching lines @@
       sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
 }
 
 void PrefModelAssociator::SetPrefService(PrefServiceSyncable* pref_service) {
   DCHECK(pref_service_ == NULL);
   pref_service_ = pref_service;
 }
 
 void PrefModelAssociator::NotifySyncedPrefObservers(const std::string& path,
                                                     bool from_sync) const {
-  SyncedPrefObserverMap::const_iterator observer_iter =
-      synced_pref_observers_.find(path);
+  auto observer_iter = synced_pref_observers_.find(path);
   if (observer_iter == synced_pref_observers_.end())
     return;
-  SyncedPrefObserverList* observers = observer_iter->second;
+  SyncedPrefObserverList* observers = observer_iter->second.get();
   FOR_EACH_OBSERVER(SyncedPrefObserver, *observers,
                     OnSyncedPrefChanged(path, from_sync));
 }
 
 }  // namespace syncable_prefs