chrome/browser/safe_browsing/safe_browsing_blocking_page.cc - Issue 1870003002: Convert //chrome/browser/safe_browsing 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/safe_browsing/safe_browsing_blocking_page.cc

Issue 1870003002: Convert //chrome/browser/safe_browsing from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and address comments 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/safe_browsing/protocol_parser_unittest.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

index 14c19170c1ba621a19922dd051f17df2487b5d28..67eb6ae3a726a8266a3d723225030b632316724e 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

@@ -13,6 +13,7 @@

#include "base/i18n/rtl.h"

#include "base/lazy_instance.h"

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "base/metrics/field_trial.h"

#include "base/metrics/histogram.h"

#include "base/strings/string_number_conversions.h"

@@ -179,7 +180,7 @@ SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(

reporting_info.extra_suffix = GetExtraMetricsSuffix();

reporting_info.rappor_prefix = GetRapporPrefix();

reporting_info.rappor_report_type = rappor::SAFEBROWSING_RAPPOR_TYPE;

- set_metrics_helper(make_scoped_ptr(new ChromeMetricsHelper(

+ set_metrics_helper(base::WrapUnique(new ChromeMetricsHelper(

web_contents, request_url(), reporting_info, GetSamplingEventName())));

metrics_helper()->RecordUserDecision(

security_interstitials::MetricsHelper::SHOW);