Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chrome/browser/io_thread.cc

Issue 640353003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo 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
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 7983f1cda3c2ee7224b675193d352948e0791ee8..f6ae5163946e5d0e8b5eca5d5224624de62b0fd0 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -220,13 +220,13 @@ scoped_ptr<net::HostResolver> CreateGlobalHostResolver(net::NetLog* net_log) {
// rules on top of the real host resolver. This allows forwarding all requests
// through a designated test server.
if (!command_line.HasSwitch(switches::kHostResolverRules))
- return global_host_resolver.PassAs<net::HostResolver>();
+ return global_host_resolver.Pass();
scoped_ptr<net::MappedHostResolver> remapped_resolver(
new net::MappedHostResolver(global_host_resolver.Pass()));
remapped_resolver->SetRulesFromString(
command_line.GetSwitchValueASCII(switches::kHostResolverRules));
- return remapped_resolver.PassAs<net::HostResolver>();
+ return remapped_resolver.Pass();
}
// TODO(willchan): Remove proxy script fetcher context since it's not necessary
@@ -710,8 +710,7 @@ void IOThread::InitAsync() {
new net::FtpProtocolHandler(
globals_->proxy_script_fetcher_ftp_transaction_factory.get()));
#endif
- globals_->proxy_script_fetcher_url_request_job_factory =
- job_factory.PassAs<net::URLRequestJobFactory>();
+ globals_->proxy_script_fetcher_url_request_job_factory = job_factory.Pass();
globals_->throttler_manager.reset(new net::URLRequestThrottlerManager());
globals_->throttler_manager->set_net_log(net_log_);

Powered by Google App Engine
This is Rietveld 408576698