Split HttpNetworkSession::Params into two structs.

net/url_request/url_request_http_job.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/url_request/url_request_http_job.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 106 matching lines @@
     // Both stores are ephemeral, but it was never recorded in the CookieStore
     // which ChannelIDService it was created for, so it is unknown whether the
     // stores match.
     EPHEMERAL_UNKNOWN = 11,
     // Both stores are persistent, but it was never recorded in the CookieStore
     // which ChannelIDService it was created for, so it is unknown whether the
     // stores match.
     PERSISTENT_UNKNOWN = 12,
     EPHEMERALITY_MAX
   } ephemerality;
-  const net::HttpNetworkSession::Params* params =
-      context->GetNetworkSessionParams();
+  const net::HttpNetworkSession::Context* session_context =
+      context->GetNetworkSessionContext();
   net::CookieStore* cookie_store = context->cookie_store();
-  if (params == nullptr || params->channel_id_service == nullptr) {
+  if (session_context == nullptr ||
+      session_context->channel_id_service == nullptr) {
     ephemerality = NO_CHANNEL_ID_STORE;
   } else if (cookie_store == nullptr) {
     ephemerality = NO_COOKIE_STORE;
-  } else if (params->channel_id_service->GetChannelIDStore()->IsEphemeral()) {
+  } else if (session_context->channel_id_service->GetChannelIDStore()
+                 ->IsEphemeral()) {
     if (cookie_store->IsEphemeral()) {
       if (cookie_store->GetChannelIDServiceID() == -1) {
         ephemerality = EPHEMERAL_UNKNOWN;
       } else if (cookie_store->GetChannelIDServiceID() ==
-                 params->channel_id_service->GetUniqueID()) {
+                 session_context->channel_id_service->GetUniqueID()) {
         ephemerality = EPHEMERAL_MATCH;
       } else {
         NOTREACHED();
         ephemerality = EPHEMERAL_MISMATCH;
       }
     } else {
       NOTREACHED();
       ephemerality = CID_EPHEMERAL_COOKIE_PERSISTENT;
     }
   } else if (cookie_store->IsEphemeral()) {
     NOTREACHED();
     ephemerality = CID_PERSISTENT_COOKIE_EPHEMERAL;
   } else if (cookie_store->GetChannelIDServiceID() == -1) {
     ephemerality = PERSISTENT_UNKNOWN;
   } else if (cookie_store->GetChannelIDServiceID() ==
-             params->channel_id_service->GetUniqueID()) {
+             session_context->channel_id_service->GetUniqueID()) {
     ephemerality = PERSISTENT_MATCH;
   } else {
     NOTREACHED();
     ephemerality = PERSISTENT_MISMATCH;
   }
   UMA_HISTOGRAM_ENUMERATION("Net.TokenBinding.StoreEphemerality", ephemerality,
                             EPHEMERALITY_MAX);
 }
 
 }  // namespace
@@ skipping 1408 matching lines @@
   awaiting_callback_ = false;
 
   // Notify NetworkQualityEstimator.
   NetworkQualityEstimator* network_quality_estimator =
       request()->context()->network_quality_estimator();
   if (network_quality_estimator)
     network_quality_estimator->NotifyURLRequestDestroyed(*request());
 }
 
 }  // namespace net