diff options
| author | limasdf <limasdf@gmail.com> | 2015-11-19 20:28:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-20 04:29:58 +0000 |
| commit | 918cc2e94b4592f9211390784de4bb8534b59cc4 (patch) | |
| tree | 61c3d962f0d6b3040bf5721bb585df217cb6da53 /apps | |
| parent | becaeea6b0a554003b1b748e7c88e65546161768 (diff) | |
| download | chromium_src-918cc2e94b4592f9211390784de4bb8534b59cc4.zip chromium_src-918cc2e94b4592f9211390784de4bb8534b59cc4.tar.gz chromium_src-918cc2e94b4592f9211390784de4bb8534b59cc4.tar.bz2 | |
ScopedPtrMap -> std::map from apps, ash, media, ui
C++ 11 enables containers that contain move-only type, scoped_ptr.
So, Use std::map<key, scoped_ptr<Foo>> instead of ScopedPtrMap.
Also use std::move() instead of scoped_ptr::Pass().
TBR=avi@chromium.org
BUG=554291, 557422
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1458553006
Cr-Commit-Position: refs/heads/master@{#360745}
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/saved_files_service.cc | 8 | ||||
| -rw-r--r-- | apps/saved_files_service.h | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index 43a0062..e4a4fd9 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc @@ -275,10 +275,9 @@ void SavedFilesService::ClearQueue(const extensions::Extension* extension) { 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; } @@ -292,7 +291,8 @@ SavedFilesService::SavedFiles* SavedFilesService::GetOrInsert( 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; } diff --git a/apps/saved_files_service.h b/apps/saved_files_service.h index 6359116..0cf7d9c 100644 --- a/apps/saved_files_service.h +++ b/apps/saved_files_service.h @@ -5,11 +5,11 @@ #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/memory/scoped_ptr.h" @@ -127,8 +127,7 @@ class SavedFilesService : public KeyedService, static void SetLruSizeForTest(int size); static void ClearLruSizeForTest(); - base::ScopedPtrMap<std::string, scoped_ptr<SavedFiles>> - extension_id_to_saved_files_; + std::map<std::string, scoped_ptr<SavedFiles>> extension_id_to_saved_files_; content::NotificationRegistrar registrar_; Profile* profile_; |