Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/notifications/message_center_notification_manager.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 CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_NOTIFICATION_MANAGER_H_
 #define CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_NOTIFICATION_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 75 matching lines @@
       Profile* profile,
       const std::string& extension_id) const;
 
   FRIEND_TEST_ALL_PREFIXES(message_center::WebNotificationTrayTest,
                            ManuallyCloseMessageCenter);
 
   std::unique_ptr<message_center::MessageCenterTrayDelegate> tray_;
   message_center::MessageCenter* message_center_;  // Weak, global.
 
   // Use a map by notification_id since this mapping is the most often used.
-  typedef std::map<std::string, ProfileNotification*> NotificationMap;
-  NotificationMap profile_notifications_;
+  std::map<std::string, std::unique_ptr<ProfileNotification>>
+      profile_notifications_;
 
   // Helpers that add/remove the notification from local map.
   // The local map takes ownership of profile_notification object.
-  void AddProfileNotification(ProfileNotification* profile_notification);
+  void AddProfileNotification(
+      std::unique_ptr<ProfileNotification> profile_notification);
   void RemoveProfileNotification(ProfileNotification* profile_notification);
 
   // Returns the ProfileNotification for the |id|, or NULL if no such
   // notification is found.
   ProfileNotification* FindProfileNotification(const std::string& id) const;
 
   // Get the extension ID of the extension that the user chose to take over
   // Chorme Notification Center.
   std::string GetExtensionTakingOverNotifications(Profile* profile);
 
   std::unique_ptr<message_center::NotifierSettingsProvider> settings_provider_;
 
   // To own the blockers.
   std::vector<std::unique_ptr<message_center::NotificationBlocker>> blockers_;
 
   NotificationSystemObserver system_observer_;
 
   // Keeps track of all notification statistics for UMA purposes.
   MessageCenterStatsCollector stats_collector_;
 
   // Keeps track of notifications specific to Google Now for UMA purposes.
   GoogleNowNotificationStatsCollector google_now_stats_collector_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterNotificationManager);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_NOTIFICATION_MANAGER_H_