Remove stl_util's deletion functions from storage/.

storage/browser/fileapi/file_system_usage_cache.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_FILE_SYSTEM_USAGE_CACHE_H_
 #define STORAGE_BROWSER_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 45 matching lines @@
   bool Delete(const base::FilePath& usage_file_path);
 
   void CloseCacheFiles();
 
   static const base::FilePath::CharType kUsageFileName[];
   static const char kUsageFileHeader[];
   static const int kUsageFileSize;
   static const int kUsageFileHeaderSize;
 
  private:
-  typedef std::map<base::FilePath, base::File*> CacheFiles;
-
   // Read the size, validity and the "dirty" entry described in the .usage file.
   // Returns less than zero if no .usage file is available.
   bool Read(const base::FilePath& usage_file_path,
             bool* is_valid,
             uint32_t* dirty,
             int64_t* usage);
 
   bool Write(const base::FilePath& usage_file_path,
              bool is_valid,
              int32_t dirty,
              int64_t fs_usage);
 
   base::File* GetFile(const base::FilePath& file_path);
 
   bool ReadBytes(const base::FilePath& file_path,
                  char* buffer,
                  int64_t buffer_size);
   bool WriteBytes(const base::FilePath& file_path,
                   const char* buffer,
                   int64_t buffer_size);
   bool FlushFile(const base::FilePath& file_path);
   void ScheduleCloseTimer();
 
   bool HasCacheFileHandle(const base::FilePath& file_path);
 
   bool CalledOnValidThread();
 
   std::unique_ptr<TimedTaskHelper> timer_;
-  CacheFiles cache_files_;
+  std::map<base::FilePath, std::unique_ptr<base::File>> cache_files_;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   base::WeakPtrFactory<FileSystemUsageCache> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemUsageCache);
 };
 
 }  // namespace storage
 
 #endif  // STORAGE_BROWSER_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_