Removing load_flags from ProxyService and ProxyDelegate

jingle/glue/proxy_resolving_client_socket.cc

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 4b931cd245d8e11e1b41d4454983ed9d813a3a98..1a420f564b701587286790a701e4d5422c033d26 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -7,21 +7,20 @@
 #include <stdint.h>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_address.h"
-#include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_auth_controller.h"
 #include "net/http/http_network_session.h"
 #include "net/http/proxy_client_socket.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace jingle_glue {
@@ -137,21 +136,20 @@ int ProxyResolvingClientSocket::SetSendBufferSize(int32_t size) {
 int ProxyResolvingClientSocket::Connect(
     const net::CompletionCallback& callback) {
   DCHECK(user_connect_callback_.is_null());
 
   tried_direct_connect_fallback_ = false;
 
   // First we try and resolve the proxy.
   int status = network_session_->proxy_service()->ResolveProxy(
       proxy_url_,
       std::string(),
-      net::LOAD_NORMAL,
       &proxy_info_,
       proxy_resolve_callback_,
       &pac_request_,
       NULL,
       bound_net_log_);
   if (status != net::ERR_IO_PENDING) {
     // We defer execution of ProcessProxyResolveDone instead of calling it
     // directly here for simplicity. From the caller's point of view,
     // the connect always happens asynchronously.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -286,22 +284,22 @@ int ProxyResolvingClientSocket::ReconsiderProxyAfterError(int error) {
     default:
       return error;
   }
 
   if (proxy_info_.is_https() && ssl_config_.send_client_cert) {
     network_session_->ssl_client_auth_cache()->Remove(
         proxy_info_.proxy_server().host_port_pair());
   }
 
   int rv = network_session_->proxy_service()->ReconsiderProxyAfterError(
-      proxy_url_, std::string(), net::LOAD_NORMAL, error, &proxy_info_,
-      proxy_resolve_callback_, &pac_request_, NULL, bound_net_log_);
+      proxy_url_, std::string(), error, &proxy_info_, proxy_resolve_callback_,
+      &pac_request_, NULL, bound_net_log_);
   if (rv == net::OK || rv == net::ERR_IO_PENDING) {
     CloseTransportSocket();
   } else {
     // If ReconsiderProxyAfterError() failed synchronously, it means
     // there was nothing left to fall-back to, so fail the transaction
     // with the last connection error we got.
     rv = error;
   }
 
   // We either have new proxy info or there was an error in falling back.