Split HttpNetworkSession::Params into two structs.

google_apis/gcm/tools/mcs_probe.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A standalone tool for testing MCS connections and the MCS client on their
 // own.
 
 #include <stdint.h>
 
 #include <cstddef>
@@ skipping 391 matching lines @@
   cert_transparency_verifier_.reset(new net::MultiLogCTVerifier());
   ct_policy_enforcer_.reset(new net::CTPolicyEnforcer());
   http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create(
       &http_auth_preferences_, host_resolver_.get());
   http_server_properties_.reset(new net::HttpServerPropertiesImpl());
   proxy_service_ = net::ProxyService::CreateDirectWithNetLog(&net_log_);
 }
 
 void MCSProbe::BuildNetworkSession() {
   net::HttpNetworkSession::Params session_params;
-  session_params.host_resolver = host_resolver_.get();
-  session_params.cert_verifier = cert_verifier_.get();
-  session_params.channel_id_service = system_channel_id_service_.get();
-  session_params.transport_security_state = transport_security_state_.get();
-  session_params.cert_transparency_verifier = cert_transparency_verifier_.get();
-  session_params.ct_policy_enforcer = ct_policy_enforcer_.get();
-  session_params.ssl_config_service = new net::SSLConfigServiceDefaults();
-  session_params.http_auth_handler_factory = http_auth_handler_factory_.get();
-  session_params.http_server_properties = http_server_properties_.get();
   session_params.ignore_certificate_errors = true;
   session_params.testing_fixed_http_port = 0;
   session_params.testing_fixed_https_port = 0;
-  session_params.net_log = &net_log_;
-  session_params.proxy_service = proxy_service_.get();
 
-  network_session_.reset(new net::HttpNetworkSession(session_params));
+  net::HttpNetworkSession::Context session_context;
+  session_context.host_resolver = host_resolver_.get();
+  session_context.cert_verifier = cert_verifier_.get();
+  session_context.channel_id_service = system_channel_id_service_.get();
+  session_context.transport_security_state = transport_security_state_.get();
+  session_context.cert_transparency_verifier =
+      cert_transparency_verifier_.get();
+  session_context.ct_policy_enforcer = ct_policy_enforcer_.get();
+  session_context.ssl_config_service = new net::SSLConfigServiceDefaults();
+  session_context.http_auth_handler_factory = http_auth_handler_factory_.get();
+  session_context.http_server_properties = http_server_properties_.get();
+  session_context.net_log = &net_log_;
+  session_context.proxy_service = proxy_service_.get();
+
+  network_session_.reset(
+      new net::HttpNetworkSession(session_params, session_context));
 }
 
 void MCSProbe::ErrorCallback() {
   LOG(INFO) << "MCS error happened";
 }
 
 void MCSProbe::CheckIn() {
   LOG(INFO) << "Check-in request initiated.";
   checkin_proto::ChromeBuildProto chrome_build_proto;
   chrome_build_proto.set_platform(
@@ skipping 74 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }