Remove base::ScopedPtrHashMap from chrome/browser/extensions.

chrome/browser/extensions/extension_management.cc

 // Copyright 2014 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 "chrome/browser/extensions/extension_management.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 95 matching lines @@
       return iter_update_url->second->installation_mode;
   }
   // Fall back to default installation mode setting.
   return default_settings_->installation_mode;
 }
 
 std::unique_ptr<base::DictionaryValue>
 ExtensionManagement::GetForceInstallList() const {
   std::unique_ptr<base::DictionaryValue> install_list(
       new base::DictionaryValue());
-  for (SettingsIdMap::const_iterator it = settings_by_id_.begin();
-       it != settings_by_id_.end();
-       ++it) {
-    if (it->second->installation_mode == INSTALLATION_FORCED) {
-      ExternalPolicyLoader::AddExtension(
-          install_list.get(), it->first, it->second->update_url);
+  for (const auto& entry : settings_by_id_) {
+    if (entry.second->installation_mode == INSTALLATION_FORCED) {
+      ExternalPolicyLoader::AddExtension(install_list.get(), entry.first,
+                                         entry.second->update_url);
     }
   }
   return install_list;
 }
 
 std::unique_ptr<base::DictionaryValue>
 ExtensionManagement::GetRecommendedInstallList() const {
   std::unique_ptr<base::DictionaryValue> install_list(
       new base::DictionaryValue());
-  for (SettingsIdMap::const_iterator it = settings_by_id_.begin();
-       it != settings_by_id_.end();
-       ++it) {
-    if (it->second->installation_mode == INSTALLATION_RECOMMENDED) {
-      ExternalPolicyLoader::AddExtension(
-          install_list.get(), it->first, it->second->update_url);
+  for (const auto& entry : settings_by_id_) {
+    if (entry.second->installation_mode == INSTALLATION_RECOMMENDED) {
+      ExternalPolicyLoader::AddExtension(install_list.get(), entry.first,
+                                         entry.second->update_url);
     }
   }
   return install_list;
 }
 
 bool ExtensionManagement::IsInstallationExplicitlyAllowed(
     const ExtensionId& id) const {
-  SettingsIdMap::const_iterator it = settings_by_id_.find(id);
+  auto it = settings_by_id_.find(id);
   // No settings explicitly specified for |id|.
   if (it == settings_by_id_.end())
     return false;
   // Checks if the extension is on the automatically installed list or
   // install white-list.
   InstallationMode mode = it->second->installation_mode;
   return mode == INSTALLATION_FORCED || mode == INSTALLATION_RECOMMENDED ||
          mode == INSTALLATION_ALLOWED;
 }
 
@@ skipping 283 matching lines @@
 }
 
 void ExtensionManagement::NotifyExtensionManagementPrefChanged() {
   for (auto& observer : observer_list_)
     observer.OnExtensionManagementSettingsChanged();
 }
 
 internal::IndividualSettings* ExtensionManagement::AccessById(
     const ExtensionId& id) {
   DCHECK(crx_file::id_util::IdIsValid(id)) << "Invalid ID: " << id;
-  SettingsIdMap::iterator it = settings_by_id_.find(id);
-  if (it == settings_by_id_.end()) {
-    std::unique_ptr<internal::IndividualSettings> settings(
-        new internal::IndividualSettings(default_settings_.get()));
-    it = settings_by_id_.add(id, std::move(settings)).first;
+  std::unique_ptr<internal::IndividualSettings>& settings = settings_by_id_[id];
+  if (!settings) {
+    settings =
+        base::MakeUnique<internal::IndividualSettings>(default_settings_.get());
   }
-  return it->second;
+  return settings.get();
 }
 
 internal::IndividualSettings* ExtensionManagement::AccessByUpdateUrl(
     const std::string& update_url) {
   DCHECK(GURL(update_url).is_valid()) << "Invalid update URL: " << update_url;
-  SettingsUpdateUrlMap::iterator it = settings_by_update_url_.find(update_url);
-  if (it == settings_by_update_url_.end()) {
-    std::unique_ptr<internal::IndividualSettings> settings(
-        new internal::IndividualSettings(default_settings_.get()));
-    it = settings_by_update_url_.add(update_url, std::move(settings)).first;
+  std::unique_ptr<internal::IndividualSettings>& settings =
+      settings_by_update_url_[update_url];
+  if (!settings) {
+    settings =
+        base::MakeUnique<internal::IndividualSettings>(default_settings_.get());
   }
-  return it->second;
+  return settings.get();
 }
 
 ExtensionManagement* ExtensionManagementFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   return static_cast<ExtensionManagement*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 ExtensionManagementFactory* ExtensionManagementFactory::GetInstance() {
   return base::Singleton<ExtensionManagementFactory>::get();
@@ skipping 20 matching lines @@
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 void ExtensionManagementFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* user_prefs) {
   user_prefs->RegisterDictionaryPref(pref_names::kExtensionManagement);
 }
 
 }  // namespace extensions