Split HttpNetworkSession::Params into two structs.

components/gcm_driver/gcm_client_impl.cc

 // Copyright 2014 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/gcm_driver/gcm_client_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 307 matching lines @@
     GCMClient::Delegate* delegate) {
   DCHECK_EQ(UNINITIALIZED, state_);
   DCHECK(url_request_context_getter.get());
   DCHECK(delegate);
 
   url_request_context_getter_ = url_request_context_getter;
   const net::HttpNetworkSession::Params* network_session_params =
       url_request_context_getter_->GetURLRequestContext()->
           GetNetworkSessionParams();
   DCHECK(network_session_params);
-  network_session_.reset(new net::HttpNetworkSession(*network_session_params));
+  const net::HttpNetworkSession::Context* network_session_context =
+      url_request_context_getter_->GetURLRequestContext()
+          ->GetNetworkSessionContext();
+  network_session_.reset(new net::HttpNetworkSession(*network_session_params,
+                                                     *network_session_context));
 
   chrome_build_info_ = chrome_build_info;
 
   gcm_store_.reset(
       new GCMStoreImpl(path, blocking_task_runner, std::move(encryptor)));
 
   delegate_ = delegate;
 
   recorder_.SetDelegate(this);
 
@@ skipping 1163 matching lines @@
 bool GCMClientImpl::HasStandaloneRegisteredApp() const {
   if (registrations_.empty())
     return false;
   // Note that account mapper is not counted as a standalone app since it is
   // automatically started when other app uses GCM.
   return registrations_.size() > 1 ||
          !ExistsGCMRegistrationInMap(registrations_, kGCMAccountMapperAppId);
 }
 
 }  // namespace gcm