Remove stl_util's STLDeleteContainerPairSecondPointers.

components/syncable_prefs/pref_model_associator.h

 // 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.
 
 #ifndef COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_
 #define COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 171 matching lines @@
   // Sync's error handler. We use this to create sync errors.
   std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory_;
 
   // The datatype that this associator is responible for, either PREFERENCES or
   // PRIORITY_PREFERENCES.
   syncer::ModelType type_;
 
  private:
   // Map prefs to lists of observers. Observers will receive notification when
   // a pref changes, including the detail of whether or not the change came
   // from sync.

[battre, 2016/09/22 16:44:24]

I think that I would keep the typedef so that this comment makes sense here.

[Avi (use Gerrit), 2016/09/22 19:17:17]

Fixed.

-  typedef base::ObserverList<SyncedPrefObserver> SyncedPrefObserverList;
-  typedef base::hash_map<std::string, SyncedPrefObserverList*>
-      SyncedPrefObserverMap;
+  using SyncedPrefObserverList = base::ObserverList<SyncedPrefObserver>;
 
   void NotifySyncedPrefObservers(const std::string& path, bool from_sync) const;
 
-  SyncedPrefObserverMap synced_pref_observers_;
+  base::hash_map<std::string, std::unique_ptr<SyncedPrefObserverList>>
+      synced_pref_observers_;
   const PrefModelAssociatorClient* client_;  // Weak.
 
   std::vector<base::Closure> callback_list_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator);
 };
 
 }  // namespace syncable_prefs
 
 #endif  // COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_