chrome/browser/chromeos/certificate_provider/certificate_requests.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/certificate_provider/certificate_requests.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/certificate_provider/certificate_requests.h ('k') | chrome/browser/chromeos/certificate_provider/thread_safe_certificate_map.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/certificate_provider/certificate_requests.cc

diff --git a/chrome/browser/chromeos/certificate_provider/certificate_requests.cc b/chrome/browser/chromeos/certificate_provider/certificate_requests.cc

index 448a644171d1017e5c873ffcc8fc7dae9fc05ec8..ecd2f4633babb105f76b73119f612c484d8c9014 100644

--- a/chrome/browser/chromeos/certificate_provider/certificate_requests.cc

+++ b/chrome/browser/chromeos/certificate_provider/certificate_requests.cc

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

#include "chrome/browser/chromeos/certificate_provider/certificate_requests.h"

+#include <memory>

#include <set>

#include <utility>

@@ -11,7 +12,6 @@

#include "base/callback.h"

#include "base/location.h"

#include "base/logging.h"

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

#include "base/time/time.h"

#include "base/timer/timer.h"

@@ -50,7 +50,7 @@ int CertificateRequests::AddRequest(

const std::vector<std::string>& extension_ids,

const base::Callback<void(const net::CertificateList&)>& callback,

const base::Callback<void(int)>& timeout_callback) {

- scoped_ptr<CertificateRequestState> state(new CertificateRequestState);

+ std::unique_ptr<CertificateRequestState> state(new CertificateRequestState);

state->callback = callback;

state->pending_extensions.insert(extension_ids.begin(), extension_ids.end());