Remove stl_util's STLDeleteContainerPairSecondPointers from storage/.

storage/browser/fileapi/isolated_context.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 STORAGE_BROWSER_FILEAPI_ISOLATED_CONTEXT_H_
 #define STORAGE_BROWSER_FILEAPI_ISOLATED_CONTEXT_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 148 matching lines @@
 
   // Returns the virtual root path that looks like /<filesystem_id>.
   base::FilePath CreateVirtualRootPath(const std::string& filesystem_id) const;
 
  private:
   friend struct base::DefaultLazyInstanceTraits<IsolatedContext>;
 
   // Represents each file system instance (defined in the .cc).
   class Instance;
 
-  typedef std::map<std::string, Instance*> IDToInstance;
-
-  // Reverse map from registered path to IDs.
-  typedef std::map<base::FilePath, std::set<std::string> > PathToID;
-
   // Obtain an instance of this class via GetInstance().
   IsolatedContext();
   ~IsolatedContext() override;
 
   // MountPoints overrides.
   FileSystemURL CrackFileSystemURL(const FileSystemURL& url) const override;
 
   // Unregisters a file system of given |filesystem_id|. Must be called with
   // lock_ held.  Returns true if the file system is unregistered.
   bool UnregisterFileSystem(const std::string& filesystem_id);
 
   // Returns a new filesystem_id.  Called with lock.
   std::string GetNewFileSystemId() const;
 
   // This lock needs to be obtained when accessing the instance_map_.
   mutable base::Lock lock_;
 
-  IDToInstance instance_map_;
-  PathToID path_to_id_map_;
+  std::map<std::string, std::unique_ptr<Instance>> instance_map_;
+
+  // Reverse map from registered path to IDs.
+  std::map<base::FilePath, std::set<std::string>> path_to_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(IsolatedContext);
 };
 
 }  // namespace storage
 
 #endif  // STORAGE_BROWSER_FILEAPI_ISOLATED_CONTEXT_H_