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

Unified Diff: net/socket/client_socket_factory.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 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 | « net/socket/buffered_write_stream_socket.cc ('k') | net/socket/client_socket_pool_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_factory.cc
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index f97500a280e44edc4839ee9bbbd18562e086e192..022988aa6a9917f38c100ba5eaca4f428f5029fd 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -98,15 +98,18 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
// from call to call.
scoped_refptr<base::SequencedTaskRunner> nss_task_runner(
nss_thread_task_runner_);
- if (!nss_task_runner)
+ if (!nss_task_runner.get())
nss_task_runner = base::ThreadTaskRunnerHandle::Get();
#if defined(USE_OPENSSL)
return new SSLClientSocketOpenSSL(transport_socket, host_and_port,
ssl_config, context);
#elif defined(USE_NSS) || defined(OS_MACOSX) || defined(OS_WIN)
- return new SSLClientSocketNSS(nss_task_runner, transport_socket,
- host_and_port, ssl_config, context);
+ return new SSLClientSocketNSS(nss_task_runner.get(),
+ transport_socket,
+ host_and_port,
+ ssl_config,
+ context);
#else
NOTIMPLEMENTED();
return NULL;
« no previous file with comments | « net/socket/buffered_write_stream_socket.cc ('k') | net/socket/client_socket_pool_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698