ScopedPtrMap -> std::map from apps, ash, media, ui

apps/saved_files_service.cc

 // 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.
 
 #include "apps/saved_files_service.h"
 
 #include <algorithm>
 #include <map>
 
 #include "apps/saved_files_service_factory.h"
@@ skipping 257 matching lines @@
   }
 }
 
 void SavedFilesService::ClearQueue(const extensions::Extension* extension) {
   ClearSavedFileEntries(ExtensionPrefs::Get(profile_), extension->id());
   Clear(extension->id());
 }
 
 SavedFilesService::SavedFiles* SavedFilesService::Get(
     const std::string& extension_id) const {
-  base::ScopedPtrMap<std::string, scoped_ptr<SavedFiles>>::const_iterator it =
-      extension_id_to_saved_files_.find(extension_id);
+  auto it = extension_id_to_saved_files_.find(extension_id);
   if (it != extension_id_to_saved_files_.end())
-    return it->second;
+    return it->second.get();
 
   return NULL;
 }
 
 SavedFilesService::SavedFiles* SavedFilesService::GetOrInsert(
     const std::string& extension_id) {
   SavedFiles* saved_files = Get(extension_id);
   if (saved_files)
     return saved_files;
 
   scoped_ptr<SavedFiles> scoped_saved_files(
       new SavedFiles(profile_, extension_id));
   saved_files = scoped_saved_files.get();
-  extension_id_to_saved_files_.insert(extension_id, scoped_saved_files.Pass());
+  extension_id_to_saved_files_.insert(
+      std::make_pair(extension_id, std::move(scoped_saved_files)));
   return saved_files;
 }
 
 void SavedFilesService::Clear(const std::string& extension_id) {
   extension_id_to_saved_files_.erase(extension_id);
 }
 
 SavedFilesService::SavedFiles::SavedFiles(Profile* profile,
                                           const std::string& extension_id)
     : profile_(profile), extension_id_(extension_id) {
@@ skipping 136 matching lines @@
 void SavedFilesService::SetLruSizeForTest(int size) {
   g_max_saved_file_entries = size;
 }
 
 // static
 void SavedFilesService::ClearLruSizeForTest() {
   g_max_saved_file_entries = kMaxSavedFileEntries;
 }
 
 }  // namespace apps