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

Unified Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 2315613002: Extracted NetLog class's inner enum types into their own enum classes and (Closed)
Patch Set: Ran "git cl format" on code. Much formatting ensued. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ios_chrome_io_thread.mm ('k') | net/base/logging_network_change_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/proxy_resolving_client_socket.cc
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index 1a420f564b701587286790a701e4d5422c033d26..de1c40f4513dabe922c486818dcf0387207a39f9 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -18,6 +18,7 @@
#include "net/http/http_auth_controller.h"
#include "net/http/http_network_session.h"
#include "net/http/proxy_client_socket.h"
+#include "net/log/net_log_source_type.h"
#include "net/socket/client_socket_handle.h"
#include "net/socket/client_socket_pool_manager.h"
#include "net/url_request/url_request_context.h"
@@ -30,24 +31,23 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
const scoped_refptr<net::URLRequestContextGetter>& request_context_getter,
const net::SSLConfig& ssl_config,
const net::HostPortPair& dest_host_port_pair)
- : proxy_resolve_callback_(
- base::Bind(&ProxyResolvingClientSocket::ProcessProxyResolveDone,
- base::Unretained(this))),
- connect_callback_(
- base::Bind(&ProxyResolvingClientSocket::ProcessConnectDone,
- base::Unretained(this))),
- ssl_config_(ssl_config),
- pac_request_(NULL),
- dest_host_port_pair_(dest_host_port_pair),
- // Assume that we intend to do TLS on this socket; all
- // current use cases do.
- proxy_url_("https://" + dest_host_port_pair_.ToString()),
- tried_direct_connect_fallback_(false),
- bound_net_log_(
- net::BoundNetLog::Make(
- request_context_getter->GetURLRequestContext()->net_log(),
- net::NetLog::SOURCE_SOCKET)),
- weak_factory_(this) {
+ : proxy_resolve_callback_(
+ base::Bind(&ProxyResolvingClientSocket::ProcessProxyResolveDone,
+ base::Unretained(this))),
+ connect_callback_(
+ base::Bind(&ProxyResolvingClientSocket::ProcessConnectDone,
+ base::Unretained(this))),
+ ssl_config_(ssl_config),
+ pac_request_(NULL),
+ dest_host_port_pair_(dest_host_port_pair),
+ // Assume that we intend to do TLS on this socket; all
+ // current use cases do.
+ proxy_url_("https://" + dest_host_port_pair_.ToString()),
+ tried_direct_connect_fallback_(false),
+ bound_net_log_(net::BoundNetLog::Make(
+ request_context_getter->GetURLRequestContext()->net_log(),
+ net::NetLogSourceType::SOCKET)),
+ weak_factory_(this) {
DCHECK(request_context_getter.get());
net::URLRequestContext* request_context =
request_context_getter->GetURLRequestContext();
« no previous file with comments | « ios/chrome/browser/ios_chrome_io_thread.mm ('k') | net/base/logging_network_change_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698