From 918cc2e94b4592f9211390784de4bb8534b59cc4 Mon Sep 17 00:00:00 2001 From: limasdf Date: Thu, 19 Nov 2015 20:28:57 -0800 Subject: ScopedPtrMap -> std::map from apps, ash, media, ui C++ 11 enables containers that contain move-only type, scoped_ptr. So, Use std::map> 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} --- apps/saved_files_service.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/saved_files_service.cc') 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>::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 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; } -- cgit v1.1