Update usages of std::map to use ScopedPtrMap.

apps/saved_files_service.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 APPS_SAVED_FILES_SERVICE_H_
 #define APPS_SAVED_FILES_SERVICE_H_
 
-#include <map>
 #include <set>
 #include <string>
 #include <vector>
 
+#include "base/containers/scoped_ptr_map.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
-#include "base/stl_util.h"
+#include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
 class SavedFilesServiceUnitTest;
 FORWARD_DECLARE_TEST(SavedFilesServiceUnitTest, RetainTwoFilesTest);
 FORWARD_DECLARE_TEST(SavedFilesServiceUnitTest, EvictionTest);
 FORWARD_DECLARE_TEST(SavedFilesServiceUnitTest, SequenceNumberCompactionTest);
 
@@ skipping 94 matching lines @@
   SavedFiles* GetOrInsert(const std::string& extension_id);
 
   // Clears the SavedFiles for |extension_id|.
   void Clear(const std::string& extension_id);
 
   static void SetMaxSequenceNumberForTest(int max_value);
   static void ClearMaxSequenceNumberForTest();
   static void SetLruSizeForTest(int size);
   static void ClearLruSizeForTest();
 
-  std::map<std::string, SavedFiles*> extension_id_to_saved_files_;
-  STLValueDeleter<std::map<std::string, SavedFiles*> >
-      extension_id_to_saved_files_deleter_;
+  ScopedPtrMap<std::string, scoped_ptr<SavedFiles>>

[tapted, 2015/06/19 00:12:01]

should ScopedPtrMap be in namespace base::, same as ScopedPtrHashMap? Maybe good
for a follow-up..

[Matt Giuca, 2015/06/19 04:03:25]

I've asked Dana this on http://crbug.com/502128. If we're going to change it, I
want to do it *before* this CL because otherwise there will be a lot of churn.

[Matt Giuca, 2015/06/22 05:40:41]

Done in precursor CL https://codereview.chromium.org/1194373002.

+      extension_id_to_saved_files_;
   content::NotificationRegistrar registrar_;
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(SavedFilesService);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SAVED_FILES_SERVICE_H_