chrome/browser/profiles/profile_io_data.cc - Issue 660873002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

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/profiles/profile_io_data.cc

Issue 660873002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/profiles/profile_impl_io_data.cc ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_io_data.cc

diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc

index 0ae0885df777f33639b8b54104061b0c9e559e17..27ef592f2b9e67ef00bbdbfec874314dbfd131d2 100644

--- a/chrome/browser/profiles/profile_io_data.cc

+++ b/chrome/browser/profiles/profile_io_data.cc

@@ -940,8 +940,7 @@ void ProfileIOData::ResourceContext::CreateKeygenHandler(

new ChromeNSSCryptoModuleDelegate(chrome::kCryptoModulePasswordKeygen,

net::HostPortPair::FromURL(url)));

ChromeNSSCryptoModuleDelegate* delegate_ptr = delegate.get();

- keygen_handler->set_crypto_module_delegate(

- delegate.PassAs<crypto::NSSCryptoModuleDelegate>());

+ keygen_handler->set_crypto_module_delegate(delegate.Pass());

base::Closure bound_callback =

base::Bind(callback, base::Passed(&keygen_handler));

@@ -1160,8 +1159,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults(

#endif

// Set up interceptors in the reverse order.

- scoped_ptr<net::URLRequestJobFactory> top_job_factory =

- job_factory.PassAs<net::URLRequestJobFactory>();

+ scoped_ptr<net::URLRequestJobFactory> top_job_factory = job_factory.Pass();

for (content::URLRequestInterceptorScopedVector::reverse_iterator i =

request_interceptors.rbegin();

i != request_interceptors.rend();

@@ -1173,7 +1171,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults(

if (protocol_handler_interceptor) {

protocol_handler_interceptor->Chain(top_job_factory.Pass());

- return protocol_handler_interceptor.PassAs<net::URLRequestJobFactory>();

+ return protocol_handler_interceptor.Pass();

} else {

return top_job_factory.Pass();

}