Split HttpNetworkSession::Params into two structs.

components/safe_browsing/browser/safe_browsing_url_request_context_getter.cc

 // Copyright 2017 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 "components/safe_browsing/browser/safe_browsing_url_request_context_getter.h"
 
 #include "base/single_thread_task_runner.h"
 #include "base/task_scheduler/post_task.h"
 #include "components/safe_browsing/common/safebrowsing_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 60 matching lines @@
     safe_browsing_request_context_->set_channel_id_service(
         channel_id_service_.get());
     safe_browsing_cookie_store_->SetChannelIDServiceID(
         channel_id_service_->GetUniqueID());
 
     // Rebuild the HttpNetworkSession and the HttpTransactionFactory to use the
     // new ChannelIDService.
     if (safe_browsing_request_context_->http_transaction_factory() &&
         safe_browsing_request_context_->http_transaction_factory()
             ->GetSession()) {
-      net::HttpNetworkSession::Params safe_browsing_params =
+      net::HttpNetworkSession::Params safe_browsing_session_params =
           safe_browsing_request_context_->http_transaction_factory()
               ->GetSession()
               ->params();
-      safe_browsing_params.channel_id_service = channel_id_service_.get();
-      http_network_session_.reset(
-          new net::HttpNetworkSession(safe_browsing_params));
+      net::HttpNetworkSession::Context safe_browsing_session_context =
+          safe_browsing_request_context_->http_transaction_factory()
+              ->GetSession()
+              ->context();
+      safe_browsing_session_context.channel_id_service =
+          channel_id_service_.get();
+      http_network_session_.reset(new net::HttpNetworkSession(
+          safe_browsing_session_params, safe_browsing_session_context));
       http_transaction_factory_.reset(
           new net::HttpNetworkLayer(http_network_session_.get()));
       safe_browsing_request_context_->set_http_transaction_factory(
           http_transaction_factory_.get());
     }
     safe_browsing_request_context_->set_name("safe_browsing");
   }
 
   return safe_browsing_request_context_.get();
 }
@@ skipping 27 matching lines @@
   return base::FilePath(GetBaseFilename().value() + kCookiesFile);
 }
 
 base::FilePath SafeBrowsingURLRequestContextGetter::ChannelIDFilePath() {
   return base::FilePath(GetBaseFilename().value() + kChannelIDFile);
 }
 
 SafeBrowsingURLRequestContextGetter::~SafeBrowsingURLRequestContextGetter() {}
 
 }  // namespace safe_browsing