Split HttpNetworkSession::Params into two structs.

net/http/http_network_transaction.cc

 // Copyright (c) 2012 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.
 
 #include "net/http/http_network_transaction.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 592 matching lines @@
   return request_->url.SchemeIsCryptographic();
 }
 
 bool HttpNetworkTransaction::IsTokenBindingEnabled() const {
   if (!IsSecureRequest())
     return false;
   SSLInfo ssl_info;
   stream_->GetSSLInfo(&ssl_info);
   return ssl_info.token_binding_negotiated &&
          ssl_info.token_binding_key_param == TB_PARAM_ECDSAP256 &&
-         session_->params().channel_id_service;
+         session_->context().channel_id_service;
 }
 
 void HttpNetworkTransaction::RecordTokenBindingSupport() const {
   // This enum is used for an UMA histogram - do not change or re-use values.
   enum {
     DISABLED = 0,
     CLIENT_ONLY = 1,
     CLIENT_AND_SERVER = 2,
     CLIENT_NO_CHANNEL_ID_SERVICE = 3,
     TOKEN_BINDING_SUPPORT_MAX
   } supported;
   if (!IsSecureRequest())
     return;
   SSLInfo ssl_info;
   stream_->GetSSLInfo(&ssl_info);
   if (!session_->params().enable_token_binding) {
     supported = DISABLED;
-  } else if (!session_->params().channel_id_service) {
+  } else if (!session_->context().channel_id_service) {
     supported = CLIENT_NO_CHANNEL_ID_SERVICE;
   } else if (ssl_info.token_binding_negotiated) {
     supported = CLIENT_AND_SERVER;
   } else {
     supported = CLIENT_ONLY;
   }
   UMA_HISTOGRAM_ENUMERATION("Net.TokenBinding.Support", supported,
                             TOKEN_BINDING_SUPPORT_MAX);
 }
 
@@ skipping 320 matching lines @@
     next_state_ = STATE_GET_PROVIDED_TOKEN_BINDING_KEY;
   return rv;
 }
 
 int HttpNetworkTransaction::DoGetProvidedTokenBindingKey() {
   next_state_ = STATE_GET_PROVIDED_TOKEN_BINDING_KEY_COMPLETE;
   if (!IsTokenBindingEnabled())
     return OK;
 
   net_log_.BeginEvent(NetLogEventType::HTTP_TRANSACTION_GET_TOKEN_BINDING_KEY);
-  ChannelIDService* channel_id_service = session_->params().channel_id_service;
+  ChannelIDService* channel_id_service = session_->context().channel_id_service;
   return channel_id_service->GetOrCreateChannelID(
       request_->url.host(), &provided_token_binding_key_, io_callback_,
       &token_binding_request_);
 }
 
 int HttpNetworkTransaction::DoGetProvidedTokenBindingKeyComplete(int rv) {
   DCHECK_NE(ERR_IO_PENDING, rv);
   if (IsTokenBindingEnabled()) {
     net_log_.EndEventWithNetErrorCode(
         NetLogEventType::HTTP_TRANSACTION_GET_TOKEN_BINDING_KEY, rv);
   }
 
   if (rv == OK)
     next_state_ = STATE_GET_REFERRED_TOKEN_BINDING_KEY;
   return rv;
 }
 
 int HttpNetworkTransaction::DoGetReferredTokenBindingKey() {
   next_state_ = STATE_GET_REFERRED_TOKEN_BINDING_KEY_COMPLETE;
   if (!IsTokenBindingEnabled() || request_->token_binding_referrer.empty())
     return OK;
 
   net_log_.BeginEvent(NetLogEventType::HTTP_TRANSACTION_GET_TOKEN_BINDING_KEY);
-  ChannelIDService* channel_id_service = session_->params().channel_id_service;
+  ChannelIDService* channel_id_service = session_->context().channel_id_service;
   return channel_id_service->GetOrCreateChannelID(
       request_->token_binding_referrer, &referred_token_binding_key_,
       io_callback_, &token_binding_request_);
 }
 
 int HttpNetworkTransaction::DoGetReferredTokenBindingKeyComplete(int rv) {
   DCHECK_NE(ERR_IO_PENDING, rv);
   if (IsTokenBindingEnabled() && !request_->token_binding_referrer.empty()) {
     net_log_.EndEventWithNetErrorCode(
         NetLogEventType::HTTP_TRANSACTION_GET_TOKEN_BINDING_KEY, rv);
@@ skipping 764 matching lines @@
   if (headers->IsRedirect(nullptr)) {
     UMA_HISTOGRAM_BOOLEAN("Net.RedirectWithUnadvertisedContentEncoding",
                           !result);
     return true;
   }
 
   return result;
 }
 
 }  // namespace net