Remove base::ScopedPtrHashMap from apps/.

BUG=579229

Review-Url: https://codereview.chromium.org/2599153002
Cr-Commit-Position: refs/heads/master@{#440809}

apps/saved_files_service.cc

@@ -5,12 +5,13 @@
 #include "apps/saved_files_service.h"
 
 #include <stdint.h>
+
 #include <algorithm>
 #include <map>
+#include <unordered_map>
 #include <utility>
 
 #include "apps/saved_files_service_factory.h"
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ptr_util.h"
 #include "base/value_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -179,9 +180,8 @@ class SavedFilesService::SavedFiles {
   Profile* profile_;
   const std::string extension_id_;
 
-  // Contains all file entries that have been registered, keyed by ID. Owns
-  // values.
-  base::ScopedPtrHashMap<std::string, std::unique_ptr<SavedFileEntry>>
+  // Contains all file entries that have been registered, keyed by ID.
+  std::unordered_map<std::string, std::unique_ptr<SavedFileEntry>>
       registered_file_entries_;
 
   // The queue of file entries that have been retained, keyed by
@@ -314,18 +314,19 @@ void SavedFilesService::SavedFiles::RegisterFileEntry(
     const std::string& id,
     const base::FilePath& file_path,
     bool is_directory) {
-  if (ContainsKey(registered_file_entries_, id))
+  auto it = registered_file_entries_.find(id);
+  if (it != registered_file_entries_.end())
     return;
 
-  registered_file_entries_.add(
-      id, base::MakeUnique<SavedFileEntry>(id, file_path, is_directory, 0));
+  registered_file_entries_[id] =
+      base::MakeUnique<SavedFileEntry>(id, file_path, is_directory, 0);
 }
 
 void SavedFilesService::SavedFiles::EnqueueFileEntry(const std::string& id) {
   auto it = registered_file_entries_.find(id);
   DCHECK(it != registered_file_entries_.end());
 
-  SavedFileEntry* file_entry = it->second;
+  SavedFileEntry* file_entry = it->second.get();
   int old_sequence_number = file_entry->sequence_number;
   if (!saved_file_lru_.empty()) {
     // Get the sequence number after the last file entry in the LRU.
@@ -358,7 +359,8 @@ void SavedFilesService::SavedFiles::EnqueueFileEntry(const std::string& id) {
 }
 
 bool SavedFilesService::SavedFiles::IsRegistered(const std::string& id) const {
-  return ContainsKey(registered_file_entries_, id);
+  auto it = registered_file_entries_.find(id);
+  return it != registered_file_entries_.end();
 }
 
 const SavedFileEntry* SavedFilesService::SavedFiles::GetFileEntry(
@@ -367,15 +369,15 @@ const SavedFileEntry* SavedFilesService::SavedFiles::GetFileEntry(
   if (it == registered_file_entries_.end())
     return NULL;
 
-  return it->second;
+  return it->second.get();
 }
 
 std::vector<SavedFileEntry> SavedFilesService::SavedFiles::GetAllFileEntries()
     const {
   std::vector<SavedFileEntry> result;
   for (auto it = registered_file_entries_.begin();
        it != registered_file_entries_.end(); ++it) {
-    result.push_back(*it->second);
+    result.push_back(*it->second.get());
   }
   return result;
 }
@@ -426,7 +428,7 @@ void SavedFilesService::SavedFiles::LoadSavedFileEntriesFromPreferences() {
     const std::string& id = file_entry->id;
     saved_file_lru_.insert(
         std::make_pair(file_entry->sequence_number, file_entry.get()));
-    registered_file_entries_.add(id, std::move(file_entry));
+    registered_file_entries_[id] = std::move(file_entry);
   }
 }