| Index: net/socket_stream/socket_stream.cc
|
| diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
|
| index 7404ff34a4c4b658041026ef5db5b2758138e8ab..a28eaf6a63e85a2a92749e411de8baa72a68b17e 100644
|
| --- a/net/socket_stream/socket_stream.cc
|
| +++ b/net/socket_stream/socket_stream.cc
|
| @@ -21,6 +21,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "net/base/auth.h"
|
| #include "net/base/io_buffer.h"
|
| +#include "net/base/load_flags.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/net_util.h"
|
| #include "net/dns/host_resolver.h"
|
| @@ -630,7 +631,8 @@ int SocketStream::DoResolveProxy() {
|
| // Alternate-Protocol header here for ws:// or TLS NPN extension for wss:// .
|
|
|
| return context_->proxy_service()->ResolveProxy(
|
| - proxy_url_, &proxy_info_, io_callback_, &pac_request_, net_log_);
|
| + proxy_url_, net::LOAD_NORMAL, &proxy_info_, io_callback_, &pac_request_,
|
| + NULL, net_log_);
|
| }
|
|
|
| int SocketStream::DoResolveProxyComplete(int result) {
|
|
|