Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

chrome/browser/extensions/api/content_settings/content_settings_store.cc

 // Copyright (c) 2012 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/api/content_settings/content_settings_store.h"
 
+#include <memory>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"
 #include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 24 matching lines @@
 };
 
 ContentSettingsStore::ContentSettingsStore() {
   DCHECK(OnCorrectThread());
 }
 
 ContentSettingsStore::~ContentSettingsStore() {
   STLDeleteValues(&entries_);
 }
 
-scoped_ptr<RuleIterator> ContentSettingsStore::GetRuleIterator(
+std::unique_ptr<RuleIterator> ContentSettingsStore::GetRuleIterator(
     ContentSettingsType type,
     const content_settings::ResourceIdentifier& identifier,
     bool incognito) const {
-  std::vector<scoped_ptr<RuleIterator>> iterators;
+  std::vector<std::unique_ptr<RuleIterator>> iterators;
   // Iterate the extensions based on install time (last installed extensions
   // first).
   ExtensionEntryMap::const_reverse_iterator entry;
 
   // The individual |RuleIterators| shouldn't lock; pass |lock_| to the
   // |ConcatenationIterator| in a locked state.
-  scoped_ptr<base::AutoLock> auto_lock(new base::AutoLock(lock_));
+  std::unique_ptr<base::AutoLock> auto_lock(new base::AutoLock(lock_));
 
   for (entry = entries_.rbegin(); entry != entries_.rend(); ++entry) {
     if (!entry->second->enabled)
       continue;
 
     if (incognito) {
       iterators.push_back(
           entry->second->incognito_session_only_settings.GetRuleIterator(
               type,
               identifier,
               NULL));
       iterators.push_back(
           entry->second->incognito_persistent_settings.GetRuleIterator(
               type,
               identifier,
               NULL));
     } else {
       iterators.push_back(
           entry->second->settings.GetRuleIterator(type, identifier, NULL));
     }
   }
-  return scoped_ptr<RuleIterator>(
+  return std::unique_ptr<RuleIterator>(
       new ConcatenationIterator(std::move(iterators), auto_lock.release()));
 }
 
 void ContentSettingsStore::SetExtensionContentSetting(
     const std::string& ext_id,
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType type,
     const content_settings::ResourceIdentifier& identifier,
     ContentSetting setting,
@@ skipping 146 matching lines @@
 base::ListValue* ContentSettingsStore::GetSettingsForExtension(
     const std::string& extension_id,
     ExtensionPrefsScope scope) const {
   base::AutoLock lock(lock_);
   const OriginIdentifierValueMap* map = GetValueMap(extension_id, scope);
   if (!map)
     return NULL;
   base::ListValue* settings = new base::ListValue();
   OriginIdentifierValueMap::EntryMap::const_iterator it;
   for (it = map->begin(); it != map->end(); ++it) {
-    scoped_ptr<RuleIterator> rule_iterator(
-        map->GetRuleIterator(it->first.content_type,
-                             it->first.resource_identifier,
-                             NULL));  // We already hold the lock.
+    std::unique_ptr<RuleIterator> rule_iterator(map->GetRuleIterator(
+        it->first.content_type, it->first.resource_identifier,
+        NULL));  // We already hold the lock.
     while (rule_iterator->HasNext()) {
       const Rule& rule = rule_iterator->Next();
       base::DictionaryValue* setting_dict = new base::DictionaryValue();
       setting_dict->SetString(keys::kPrimaryPatternKey,
                               rule.primary_pattern.ToString());
       setting_dict->SetString(keys::kSecondaryPatternKey,
                               rule.secondary_pattern.ToString());
       setting_dict->SetString(
           keys::kContentSettingsTypeKey,
           helpers::ContentSettingsTypeToString(it->first.content_type));
@@ skipping 101 matching lines @@
 ContentSettingsStore::FindEntry(const std::string& ext_id) const {
   ExtensionEntryMap::const_iterator i;
   for (i = entries_.begin(); i != entries_.end(); ++i) {
     if (i->second->id == ext_id)
       return i;
   }
   return entries_.end();
 }
 
 }  // namespace extensions