net/ssl/ssl_platform_key_chromecast.cc - Issue 2259823002: Re-write many calls to WrapUnique() with MakeUnique()

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: net/ssl/ssl_platform_key_chromecast.cc

Issue 2259823002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 3 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <keyhi.h>	5 #include <keyhi.h>

6 #include <openssl/rsa.h>	6 #include <openssl/rsa.h>

7 #include <pk11pub.h>	7 #include <pk11pub.h>

8 #include <prerror.h>	8 #include <prerror.h>

9	9

10 #include "base/logging.h"	10 #include "base/logging.h"

(...skipping 110 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
121 scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(	121 scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(

122 X509Certificate* certificate) {	122 X509Certificate* certificate) {

123 crypto::ScopedSECKEYPrivateKey key(	123 crypto::ScopedSECKEYPrivateKey key(

124 PK11_FindKeyByAnyCert(certificate->os_cert_handle(), nullptr));	124 PK11_FindKeyByAnyCert(certificate->os_cert_handle(), nullptr));

125 if (!key) {	125 if (!key) {

126 return ClientKeyStore::GetInstance()->FetchClientCertPrivateKey(	126 return ClientKeyStore::GetInstance()->FetchClientCertPrivateKey(

127 *certificate);	127 *certificate);

128 }	128 }

129	129

130 return make_scoped_refptr(new ThreadedSSLPrivateKey(	130 return make_scoped_refptr(new ThreadedSSLPrivateKey(

131 base::WrapUnique(new SSLPlatformKeyChromecast(std::move(key))),	131 base::MakeUnique<SSLPlatformKeyChromecast>(std::move(key)),

132 GetSSLPlatformKeyTaskRunner()));	132 GetSSLPlatformKeyTaskRunner()));

133 }	133 }

134	134

135 } // namespace net	135 } // namespace net

OLD	NEW

« no previous file with comments | « net/ssl/default_channel_id_store_unittest.cc ('k') | net/ssl/ssl_platform_key_mac.cc » ('j') | no next file with comments »