ios/chrome/browser/ssl/ios_ssl_blocking_page.mm - Issue 1861593005: Convert //ios 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: ios/chrome/browser/ssl/ios_ssl_blocking_page.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase? 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:

Index: ios/chrome/browser/ssl/ios_ssl_blocking_page.mm

diff --git a/ios/chrome/browser/ssl/ios_ssl_blocking_page.mm b/ios/chrome/browser/ssl/ios_ssl_blocking_page.mm

index e41fec131e5d32b0eee7ecda25a31a6cfbd95d74..659711e2c430f417f2bcda9fc04215ce72f84a8c 100644

--- a/ios/chrome/browser/ssl/ios_ssl_blocking_page.mm

+++ b/ios/chrome/browser/ssl/ios_ssl_blocking_page.mm

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

#include <utility>

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

#include "base/metrics/histogram.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversions.h"

@@ -93,7 +94,7 @@ IOSSSLBlockingPage::IOSSSLBlockingPage(

reporting_info.rappor_report_type = rappor::UMA_RAPPOR_TYPE;

IOSChromeMetricsHelper* ios_chrome_metrics_helper =

new IOSChromeMetricsHelper(web_state, request_url, reporting_info);

- controller_->set_metrics_helper(make_scoped_ptr(ios_chrome_metrics_helper));

+ controller_->set_metrics_helper(base::WrapUnique(ios_chrome_metrics_helper));

ssl_error_ui_.reset(new SSLErrorUI(request_url, cert_error, ssl_info,

options_mask, time_triggered,