Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1393)

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
index b586c4e5e75647db95ea642623ae87db83f32547..f138a764be5cac1bff50a5e42b13f2d838a96bba 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
@@ -6,7 +6,8 @@
#include <stdint.h>
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "components/content_settings/core/browser/content_settings_rule.h"
#include "components/content_settings/core/browser/content_settings_utils.h"
#include "components/content_settings/core/test/content_settings_test_utils.h"
@@ -55,9 +56,9 @@ ContentSetting GetContentSettingFromStore(
ContentSettingsType content_type,
const std::string& resource_identifier,
bool incognito) {
- scoped_ptr<content_settings::RuleIterator> rule_iterator(
+ std::unique_ptr<content_settings::RuleIterator> rule_iterator(
store->GetRuleIterator(content_type, resource_identifier, incognito));
- scoped_ptr<base::Value> setting(
+ std::unique_ptr<base::Value> setting(
content_settings::TestUtils::GetContentSettingValueAndPatterns(
rule_iterator.get(), primary_url, secondary_url, NULL, NULL));
return content_settings::ValueToContentSetting(setting.get());
@@ -70,7 +71,7 @@ void GetSettingsForOneTypeFromStore(
bool incognito,
std::vector<content_settings::Rule>* rules) {
rules->clear();
- scoped_ptr<content_settings::RuleIterator> rule_iterator(
+ std::unique_ptr<content_settings::RuleIterator> rule_iterator(
store->GetRuleIterator(content_type, resource_identifier, incognito));
while (rule_iterator->HasNext())
rules->push_back(rule_iterator->Next());

Powered by Google App Engine
This is Rietveld 408576698