| Index: net/url_request/url_request_context_builder.cc
|
| diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
|
| index 82a23df1bf392d19bb3fcc6b437f441fa6dc5cc8..74c457f79f81f29d7fb20c03faece374d6e452ca 100644
|
| --- a/net/url_request/url_request_context_builder.cc
|
| +++ b/net/url_request/url_request_context_builder.cc
|
| @@ -11,7 +11,6 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/thread_task_runner_handle.h"
|
| @@ -391,8 +390,6 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
|
| network_session_params.enable_alternative_service_with_different_host =
|
| http_network_session_params_
|
| .enable_alternative_service_with_different_host;
|
| - network_session_params.trusted_spdy_proxy =
|
| - http_network_session_params_.trusted_spdy_proxy;
|
| network_session_params.next_protos = http_network_session_params_.next_protos;
|
| network_session_params.enable_quic = http_network_session_params_.enable_quic;
|
| network_session_params.quic_max_server_configs_stored_in_properties =
|
|
|