Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/ui/ash/launcher/browser_status_monitor.h

 // Copyright 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 CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 82 matching lines @@
   // profile implementations.
   virtual void RemoveV1AppFromShelf(Browser* browser);
 
   // Check if V1 application is currently in the shelf.
   bool IsV1AppInShelf(Browser* browser);
 
  private:
   class LocalWebContentsObserver;
   class SettingsWindowObserver;
 
-  typedef std::map<Browser*, std::string> BrowserToAppIDMap;
-  typedef std::map<content::WebContents*, LocalWebContentsObserver*>
-      WebContentsToObserverMap;
-
   // Create LocalWebContentsObserver for |contents|.
   void AddWebContentsObserver(content::WebContents* contents);
 
   // Remove LocalWebContentsObserver for |contents|.
   void RemoveWebContentsObserver(content::WebContents* contents);
 
   // Returns the ShelfID for |contents|.
   ash::ShelfID GetShelfIDForWebContents(content::WebContents* contents);
 
   // Sets the shelf id for browsers represented by the browser shortcut item.
   void SetShelfIDForBrowserWindowContents(Browser* browser,
                                           content::WebContents* web_contents);
 
   ChromeLauncherController* launcher_controller_;
 
-  BrowserToAppIDMap browser_to_app_id_map_;
-  WebContentsToObserverMap webcontents_to_observer_map_;
+  std::map<Browser*, std::string> browser_to_app_id_map_;
+  std::map<content::WebContents*, std::unique_ptr<LocalWebContentsObserver>>
+      webcontents_to_observer_map_;
   std::unique_ptr<SettingsWindowObserver> settings_window_observer_;
 
   BrowserTabStripTracker browser_tab_strip_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_