chrome/browser/extensions/api/content_settings/content_settings_helpers.cc - Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_helpers.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

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

index 915f5345f7c6f92b8818b1ef4b8a9abe3b9d72aa..c463d6dc02770beb6fa160ad734bf8cab2de4761 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

@@ -4,8 +4,9 @@

#include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"

+#include <memory>

#include "base/logging.h"

-#include "base/memory/scoped_ptr.h"

#include "components/content_settings/core/browser/website_settings_info.h"

#include "components/content_settings/core/browser/website_settings_registry.h"

#include "content/public/common/url_constants.h"

@@ -44,7 +45,7 @@ ContentSettingsPattern ParseExtensionPattern(const std::string& pattern_str,

*error = URLPattern::GetParseResultString(result);

return ContentSettingsPattern();

} else {

- scoped_ptr<ContentSettingsPattern::BuilderInterface> builder(

+ std::unique_ptr<ContentSettingsPattern::BuilderInterface> builder(

ContentSettingsPattern::CreateBuilder(false));

builder->WithHost(url_pattern.host());

if (url_pattern.match_subdomains())