Split HttpNetworkSession::Params into two structs.

net/url_request/url_request_test_util.h

 // 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 #define NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 
 #include <stdint.h>
 #include <stdlib.h>
 
@@ skipping 59 matching lines @@
     client_socket_factory_ = factory;
   }
 
   ProxyDelegate* proxy_delegate() { return proxy_delegate_; }
 
   void set_proxy_delegate(ProxyDelegate* proxy_delegate) {
     proxy_delegate_ = proxy_delegate;
   }
 
   void set_http_network_session_params(
-      std::unique_ptr<HttpNetworkSession::Params> params) {
-    http_network_session_params_ = std::move(params);
+      std::unique_ptr<HttpNetworkSession::Params> session_params) {
+    http_network_session_params_ = std::move(session_params);
+  }
+
+  void set_http_network_session_context(
+      std::unique_ptr<HttpNetworkSession::Context> session_context) {
+    http_network_session_context_ = std::move(session_context);
   }
 
   void SetSdchManager(std::unique_ptr<SdchManager> sdch_manager) {
     context_storage_.set_sdch_manager(std::move(sdch_manager));
   }
 
   void SetCTPolicyEnforcer(
       std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer) {
     context_storage_.set_ct_policy_enforcer(std::move(ct_policy_enforcer));
   }
 
  private:
   bool initialized_ = false;
 
-  // Optional parameters to override default values.  Note that values that
-  // point to other objects the TestURLRequestContext creates will be
-  // overwritten.
+  // Optional parameters to override default values.  Note that values in the
+  // HttpNetworkSession::Context that point to other objects the
+  // TestURLRequestContext creates will be overwritten.
   std::unique_ptr<HttpNetworkSession::Params> http_network_session_params_;
+  std::unique_ptr<HttpNetworkSession::Context> http_network_session_context_;
 
   // Not owned:
   ClientSocketFactory* client_socket_factory_ = nullptr;
 
   ProxyDelegate* proxy_delegate_ = nullptr;
 
  protected:
   URLRequestContextStorage context_storage_;
 };
 
@@ skipping 314 matching lines @@
       NetworkDelegate* network_delegate) const override;
   void set_main_intercept_job(std::unique_ptr<URLRequestJob> job);
 
  private:
   mutable std::unique_ptr<URLRequestJob> main_intercept_job_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_