Split HttpNetworkSession::Params into two structs.

components/safe_browsing/browser/safe_browsing_url_request_context_getter.cc

Index: components/safe_browsing/browser/safe_browsing_url_request_context_getter.cc
diff --git a/components/safe_browsing/browser/safe_browsing_url_request_context_getter.cc b/components/safe_browsing/browser/safe_browsing_url_request_context_getter.cc
index 513698fde868225b527c93597c60dda992d9b3a3..7c5ce4a40738c9c4fa6556a54b4fdb75067f2f44 100644
--- a/components/safe_browsing/browser/safe_browsing_url_request_context_getter.cc
+++ b/components/safe_browsing/browser/safe_browsing_url_request_context_getter.cc
@@ -78,13 +78,18 @@ SafeBrowsingURLRequestContextGetter::GetURLRequestContext() {
     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(