Split HttpNetworkSession::Params into two structs.

net/http/http_network_transaction_ssl_unittest.cc

Index: net/http/http_network_transaction_ssl_unittest.cc
diff --git a/net/http/http_network_transaction_ssl_unittest.cc b/net/http/http_network_transaction_ssl_unittest.cc
index b412bbe952d4063ff1e56764e27474fb31ec5c55..2bd3edd17e479e3a577ef0fd2ae29fa651f6e090 100644
--- a/net/http/http_network_transaction_ssl_unittest.cc
+++ b/net/http/http_network_transaction_ssl_unittest.cc
@@ -59,21 +59,21 @@ class HttpNetworkTransactionSSLTest : public testing::Test {
 
   void SetUp() override {
     ssl_config_service_ = new TokenBindingSSLConfigService;
-    session_params_.ssl_config_service = ssl_config_service_.get();
+    session_context_.ssl_config_service = ssl_config_service_.get();
 
     auth_handler_factory_.reset(new HttpAuthHandlerMock::Factory());
-    session_params_.http_auth_handler_factory = auth_handler_factory_.get();
+    session_context_.http_auth_handler_factory = auth_handler_factory_.get();
 
     proxy_service_ = ProxyService::CreateDirect();
-    session_params_.proxy_service = proxy_service_.get();
-
-    session_params_.client_socket_factory = &mock_socket_factory_;
-    session_params_.host_resolver = &mock_resolver_;
-    session_params_.http_server_properties = &http_server_properties_;
-    session_params_.cert_verifier = &cert_verifier_;
-    session_params_.transport_security_state = &transport_security_state_;
-    session_params_.cert_transparency_verifier = &ct_verifier_;
-    session_params_.ct_policy_enforcer = &ct_policy_enforcer_;
+    session_context_.proxy_service = proxy_service_.get();
+
+    session_context_.client_socket_factory = &mock_socket_factory_;
+    session_context_.host_resolver = &mock_resolver_;
+    session_context_.http_server_properties = &http_server_properties_;
+    session_context_.cert_verifier = &cert_verifier_;
+    session_context_.transport_security_state = &transport_security_state_;
+    session_context_.cert_transparency_verifier = &ct_verifier_;
+    session_context_.ct_policy_enforcer = &ct_policy_enforcer_;
   }
 
   HttpRequestInfo* GetRequestInfo(const std::string& url) {
@@ -95,14 +95,14 @@ class HttpNetworkTransactionSSLTest : public testing::Test {
   TransportSecurityState transport_security_state_;
   MultiLogCTVerifier ct_verifier_;
   CTPolicyEnforcer ct_policy_enforcer_;
-  HttpNetworkSession::Params session_params_;
+  HttpNetworkSession::Context session_context_;
   std::vector<std::unique_ptr<HttpRequestInfo>> request_info_vector_;
 };
 
 #if !defined(OS_IOS)
 TEST_F(HttpNetworkTransactionSSLTest, TokenBinding) {
   ChannelIDService channel_id_service(new DefaultChannelIDStore(NULL));
-  session_params_.channel_id_service = &channel_id_service;
+  session_context_.channel_id_service = &channel_id_service;
 
   SSLSocketDataProvider ssl_data(ASYNC, OK);
   ssl_data.token_binding_negotiated = true;
@@ -113,7 +113,7 @@ TEST_F(HttpNetworkTransactionSSLTest, TokenBinding) {
   StaticSocketDataProvider data(mock_reads, arraysize(mock_reads), NULL, 0);
   mock_socket_factory_.AddSocketDataProvider(&data);
 
-  HttpNetworkSession session(session_params_);
+  HttpNetworkSession session(HttpNetworkSession::Params(), session_context_);
   HttpNetworkTransaction trans1(DEFAULT_PRIORITY, &session);
 
   TestCompletionCallback callback;
@@ -151,7 +151,7 @@ TEST_F(HttpNetworkTransactionSSLTest, TokenBinding) {
 
 TEST_F(HttpNetworkTransactionSSLTest, NoTokenBindingOverHttp) {
   ChannelIDService channel_id_service(new DefaultChannelIDStore(NULL));
-  session_params_.channel_id_service = &channel_id_service;
+  session_context_.channel_id_service = &channel_id_service;
 
   SSLSocketDataProvider ssl_data(ASYNC, OK);
   ssl_data.token_binding_negotiated = true;
@@ -162,7 +162,7 @@ TEST_F(HttpNetworkTransactionSSLTest, NoTokenBindingOverHttp) {
   StaticSocketDataProvider data(mock_reads, arraysize(mock_reads), NULL, 0);
   mock_socket_factory_.AddSocketDataProvider(&data);
 
-  HttpNetworkSession session(session_params_);
+  HttpNetworkSession session(HttpNetworkSession::Params(), session_context_);
   HttpNetworkTransaction trans(DEFAULT_PRIORITY, &session);
 
   TestCompletionCallback callback;
@@ -188,7 +188,7 @@ TEST_F(HttpNetworkTransactionSSLTest, TokenBindingAsync) {
       new base::DeferredSequencedTaskRunner(channel_id_thread.task_runner());
   ChannelIDService channel_id_service(new DefaultChannelIDStore(nullptr));
   channel_id_service.set_task_runner_for_testing(channel_id_runner);
-  session_params_.channel_id_service = &channel_id_service;
+  session_context_.channel_id_service = &channel_id_service;
 
   SSLSocketDataProvider ssl_data(ASYNC, OK);
   ssl_data.token_binding_negotiated = true;
@@ -205,7 +205,7 @@ TEST_F(HttpNetworkTransactionSSLTest, TokenBindingAsync) {
   request_info.method = "GET";
   request_info.token_binding_referrer = "encrypted.example.com";
 
-  HttpNetworkSession session(session_params_);
+  HttpNetworkSession session(HttpNetworkSession::Params(), session_context_);
   HttpNetworkTransaction trans(DEFAULT_PRIORITY, &session);
 
   TestCompletionCallback callback;