diff options
15 files changed, 40 insertions, 48 deletions
diff --git a/chrome/browser/chromeos/certificate_provider/certificate_requests.cc b/chrome/browser/chromeos/certificate_provider/certificate_requests.cc index f24552a..8804c2f 100644 --- a/chrome/browser/chromeos/certificate_provider/certificate_requests.cc +++ b/chrome/browser/chromeos/certificate_provider/certificate_requests.cc @@ -58,7 +58,8 @@ int CertificateRequests::AddRequest( FROM_HERE, base::TimeDelta::FromMinutes(kGetCertificatesTimeoutInMinutes), base::Bind(timeout_callback, request_id)); - const auto insert_result = requests_.insert(request_id, state.Pass()); + const auto insert_result = + requests_.insert(std::make_pair(request_id, state.Pass())); DCHECK(insert_result.second) << "request id already in use."; return request_id; } @@ -101,11 +102,11 @@ bool CertificateRequests::RemoveRequest( std::vector<int> CertificateRequests::DropExtension( const std::string& extension_id) { std::vector<int> completed_requests; - for (auto& entry : requests_) { + for (const auto& entry : requests_) { DVLOG(2) << "Remove extension " << extension_id << " from certificate request " << entry.first; - CertificateRequestState& state = *entry.second; + CertificateRequestState& state = *entry.second.get(); state.pending_extensions.erase(extension_id); if (state.pending_extensions.empty()) completed_requests.push_back(entry.first); diff --git a/chrome/browser/chromeos/certificate_provider/certificate_requests.h b/chrome/browser/chromeos/certificate_provider/certificate_requests.h index aaa8375..a2b0d3b 100644 --- a/chrome/browser/chromeos/certificate_provider/certificate_requests.h +++ b/chrome/browser/chromeos/certificate_provider/certificate_requests.h @@ -10,7 +10,6 @@ #include <vector> #include "base/callback_forward.h" -#include "base/containers/scoped_ptr_map.h" #include "base/macros.h" #include "chrome/browser/chromeos/certificate_provider/certificate_info.h" #include "net/cert/x509_certificate.h" @@ -56,7 +55,7 @@ class CertificateRequests { private: struct CertificateRequestState; - base::ScopedPtrMap<int, scoped_ptr<CertificateRequestState>> requests_; + std::map<int, scoped_ptr<CertificateRequestState>> requests_; int next_free_request_id_ = 0; DISALLOW_COPY_AND_ASSIGN(CertificateRequests); diff --git a/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.cc b/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.cc index 3c020e9..52be425 100644 --- a/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.cc +++ b/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.cc @@ -22,9 +22,9 @@ void BuildFingerprintsMap( const net::SHA256HashValue fingerprint = net::X509Certificate::CalculateFingerprint256( cert_info.certificate->os_cert_handle()); - fingerprint_to_cert->insert( + fingerprint_to_cert->insert(std::make_pair( fingerprint, make_scoped_ptr(new ThreadSafeCertificateMap::MapValue( - cert_info, extension_id))); + cert_info, extension_id)))); } } } @@ -53,7 +53,7 @@ void ThreadSafeCertificateMap::Update( for (const auto& entry : fingerprint_to_cert_and_extension_) { const net::SHA256HashValue& fingerprint = entry.first; // This doesn't modify the map if it already contains the key |fingerprint|. - new_fingerprint_map.insert(fingerprint, nullptr); + new_fingerprint_map.insert(std::make_pair(fingerprint, nullptr)); } fingerprint_to_cert_and_extension_.swap(new_fingerprint_map); } @@ -72,7 +72,7 @@ bool ThreadSafeCertificateMap::LookUpCertificate( if (it == fingerprint_to_cert_and_extension_.end()) return false; - MapValue* const value = it->second; + MapValue* const value = it->second.get(); if (value) { *is_currently_provided = true; *info = value->cert_info; @@ -85,11 +85,11 @@ void ThreadSafeCertificateMap::RemoveExtension( const std::string& extension_id) { base::AutoLock auto_lock(lock_); for (auto& entry : fingerprint_to_cert_and_extension_) { - MapValue* const value = entry.second; + MapValue* const value = entry.second.get(); // Only remove the association of the fingerprint to the extension, but keep // the fingerprint. if (value && value->extension_id == extension_id) - fingerprint_to_cert_and_extension_.set(entry.first, nullptr); + fingerprint_to_cert_and_extension_[entry.first] = nullptr; } } diff --git a/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.h b/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.h index e9d5a99..a355621 100644 --- a/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.h +++ b/chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.h @@ -8,7 +8,6 @@ #include <map> #include <string> -#include "base/containers/scoped_ptr_map.h" #include "base/macros.h" #include "base/synchronization/lock.h" #include "chrome/browser/chromeos/certificate_provider/certificate_info.h" @@ -32,9 +31,9 @@ class ThreadSafeCertificateMap { std::string extension_id; }; using FingerprintToCertAndExtensionMap = - base::ScopedPtrMap<net::SHA256HashValue, - scoped_ptr<MapValue>, - net::SHA256HashValueLessThan>; + std::map<net::SHA256HashValue, + scoped_ptr<MapValue>, + net::SHA256HashValueLessThan>; ThreadSafeCertificateMap(); ~ThreadSafeCertificateMap(); diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc index 9dc47941..7ef1064 100644 --- a/chrome/browser/media/media_stream_devices_controller.cc +++ b/chrome/browser/media/media_stream_devices_controller.cc @@ -4,9 +4,10 @@ #include "chrome/browser/media/media_stream_devices_controller.h" +#include <map> + #include "base/auto_reset.h" #include "base/callback_helpers.h" -#include "base/containers/scoped_ptr_map.h" #include "base/metrics/histogram.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" @@ -89,8 +90,7 @@ class MediaPermissionRequestLogger : content::WebContentsObserver { // Map of <render process id, render frame id> -> // MediaPermissionRequestLogger. using RequestMap = - base::ScopedPtrMap<std::pair<int, int>, - scoped_ptr<MediaPermissionRequestLogger>>; + std::map<std::pair<int, int>, scoped_ptr<MediaPermissionRequestLogger>>; public: static void LogRequest(content::WebContents* contents, @@ -102,8 +102,8 @@ class MediaPermissionRequestLogger : content::WebContentsObserver { if (!ContainsKey(GetRequestMap(), key)) { UMA_HISTOGRAM_BOOLEAN("Pepper.SecureOrigin.MediaStreamRequest", is_secure); - GetRequestMap().set(key, make_scoped_ptr(new MediaPermissionRequestLogger( - contents, key))); + GetRequestMap()[key] = + make_scoped_ptr(new MediaPermissionRequestLogger(contents, key)); } } diff --git a/chrome/browser/media_galleries/gallery_watch_manager.cc b/chrome/browser/media_galleries/gallery_watch_manager.cc index d579706..4368fae 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager.cc +++ b/chrome/browser/media_galleries/gallery_watch_manager.cc @@ -344,12 +344,11 @@ void GalleryWatchManager::EnsureBrowserContextSubscription( BrowserContext* browser_context) { auto it = browser_context_subscription_map_.find(browser_context); if (it == browser_context_subscription_map_.end()) { - browser_context_subscription_map_.set( - browser_context, + browser_context_subscription_map_[browser_context] = ShutdownNotifierFactory::GetInstance() ->Get(browser_context) ->Subscribe(base::Bind(&GalleryWatchManager::ShutdownBrowserContext, - base::Unretained(this), browser_context))); + base::Unretained(this), browser_context)); } } diff --git a/chrome/browser/media_galleries/gallery_watch_manager.h b/chrome/browser/media_galleries/gallery_watch_manager.h index a87a2e2..bdb08c4 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager.h +++ b/chrome/browser/media_galleries/gallery_watch_manager.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/containers/scoped_ptr_map.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/memory/linked_ptr.h" @@ -109,9 +108,8 @@ class GalleryWatchManager typedef std::map<base::FilePath, NotificationInfo> WatchedPaths; typedef std::map<content::BrowserContext*, GalleryWatchManagerObserver*> ObserverMap; - typedef base::ScopedPtrMap< - content::BrowserContext*, - scoped_ptr<KeyedServiceShutdownNotifier::Subscription>> + typedef std::map<content::BrowserContext*, + scoped_ptr<KeyedServiceShutdownNotifier::Subscription>> BrowserContextSubscriptionMap; // Ensure there is a subscription to shutdown notifications for diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc index 7b2ac40..f16b9ac 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.cc +++ b/chrome/browser/media_galleries/media_file_system_registry.cc @@ -580,11 +580,10 @@ MediaGalleriesPreferences* MediaFileSystemRegistry::GetPreferences( if (!ContainsKey(extension_hosts_map_, profile)) { extension_hosts_map_[profile] = ExtensionHostMap(); DCHECK(!ContainsKey(profile_subscription_map_, profile)); - profile_subscription_map_.set( - profile, + profile_subscription_map_[profile] = ShutdownNotifierFactory::GetInstance()->Get(profile)->Subscribe( base::Bind(&MediaFileSystemRegistry::OnProfileShutdown, - base::Unretained(this), profile))); + base::Unretained(this), profile)); media_galleries::UsageCount(media_galleries::PROFILES_WITH_USAGE); } diff --git a/chrome/browser/media_galleries/media_file_system_registry.h b/chrome/browser/media_galleries/media_file_system_registry.h index ced36ad..082f76b 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.h +++ b/chrome/browser/media_galleries/media_file_system_registry.h @@ -14,7 +14,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/containers/scoped_ptr_map.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" @@ -117,9 +116,8 @@ class MediaFileSystemRegistry // Map a profile and extension to the ExtensionGalleriesHost. typedef std::map<Profile*, ExtensionHostMap> ExtensionGalleriesHostMap; // Map a profile to a shutdown notification subscription. - typedef base::ScopedPtrMap< - Profile*, - scoped_ptr<KeyedServiceShutdownNotifier::Subscription>> + typedef std::map<Profile*, + scoped_ptr<KeyedServiceShutdownNotifier::Subscription>> ProfileSubscriptionMap; void OnPermissionRemoved(MediaGalleriesPreferences* pref, diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc index 16beb8a..cba29d6 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor.cc @@ -424,7 +424,7 @@ void ResourcePrefetchPredictor::FinishedPrefetchForNavigation( scoped_ptr<Result> result(new Result(key_type, requests)); // Add the results to the results map. - if (!results_map_.insert(navigation_id, result.Pass()).second) + if (!results_map_.insert(std::make_pair(navigation_id, result.Pass())).second) DLOG(FATAL) << "Returning results for existing navigation."; } diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h index 7f6aca4..7152735 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.h +++ b/chrome/browser/predictors/resource_prefetch_predictor.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "base/containers/scoped_ptr_map.h" #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" @@ -170,7 +169,7 @@ class ResourcePrefetchPredictor typedef ResourcePrefetchPredictorTables::PrefetchDataMap PrefetchDataMap; typedef std::map<NavigationID, linked_ptr<std::vector<URLRequestSummary> > > NavigationMap; - typedef base::ScopedPtrMap<NavigationID, scoped_ptr<Result>> ResultsMap; + typedef std::map<NavigationID, scoped_ptr<Result>> ResultsMap; // Returns true if the main page request is supported for prediction. static bool IsHandledMainPage(net::URLRequest* request); diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc index 5645fc0..a5e3028 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc @@ -59,9 +59,8 @@ void LauncherSearchProvider::SetSearchResults( DCHECK(Service::Get(profile_)->IsQueryRunning()); // Add this extension's results (erasing any existing results). - extension_results_.set( - extension_id, - make_scoped_ptr(new ScopedVector<LauncherSearchResult>(results.Pass()))); + extension_results_[extension_id] = + make_scoped_ptr(new ScopedVector<LauncherSearchResult>(results.Pass())); // Update results with other extension results. ClearResults(); diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h index 768c6c3..a1ba785 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h @@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_PROVIDER_H_ #define CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_PROVIDER_H_ -#include "base/containers/scoped_ptr_map.h" +#include <map> + #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/stl_util.h" @@ -40,9 +41,8 @@ class LauncherSearchProvider : public SearchProvider { void StartInternal(const base::string16& query); // The search results of each extension. - base::ScopedPtrMap<extensions::ExtensionId, - scoped_ptr<ScopedVector<LauncherSearchResult>>> - extension_results_; + std::map<extensions::ExtensionId, + scoped_ptr<ScopedVector<LauncherSearchResult>>> extension_results_; // A timer to delay query. base::OneShotTimer query_timer_; diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc index 152dd0d..29f875a 100644 --- a/chrome/browser/usb/usb_tab_helper.cc +++ b/chrome/browser/usb/usb_tab_helper.cc @@ -51,7 +51,7 @@ void UsbTabHelper::GetPermissionProvider( scoped_ptr<WebUSBPermissionProvider> permission_provider( new WebUSBPermissionProvider(render_frame_host)); permission_provider->Bind(request.Pass()); - permission_provider_.set(render_frame_host, permission_provider.Pass()); + permission_provider_[render_frame_host] = permission_provider.Pass(); } else { it->second->Bind(request.Pass()); } diff --git a/chrome/browser/usb/usb_tab_helper.h b/chrome/browser/usb/usb_tab_helper.h index c2bb342..003f8dd 100644 --- a/chrome/browser/usb/usb_tab_helper.h +++ b/chrome/browser/usb/usb_tab_helper.h @@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_USB_USB_TAB_HELPER_H_ #define CHROME_BROWSER_USB_USB_TAB_HELPER_H_ -#include "base/containers/scoped_ptr_map.h" +#include <map> + #include "base/macros.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" @@ -44,8 +45,8 @@ class UsbTabHelper : public content::WebContentsObserver, content::RenderFrameHost* render_frame_host, mojo::InterfaceRequest<device::usb::PermissionProvider> request); - base::ScopedPtrMap<content::RenderFrameHost*, - scoped_ptr<WebUSBPermissionProvider>> permission_provider_; + std::map<content::RenderFrameHost*, scoped_ptr<WebUSBPermissionProvider>> + permission_provider_; DISALLOW_COPY_AND_ASSIGN(UsbTabHelper); }; |