Replace URLRequestContextBuilder::HttpNetworkSessionParams

net/url_request/url_request_context_builder.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.
 
 // This class is useful for building a simple URLRequestContext. Most creators
 // of new URLRequestContexts should use this helper class to construct it. Call
 // any configuration params, and when done, invoke Build() to construct the
 // URLRequestContext. This URLRequestContext will own all its own storage.
 //
 // URLRequestContextBuilder and its associated params classes are initially
@@ skipping 31 matching lines @@
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace net {
 
 class CertVerifier;
 class ChannelIDService;
 class CookieStore;
 class CTVerifier;
-class HostMappingRules;
 class HttpAuthHandlerFactory;
 class HttpServerProperties;
 class NetworkQualityEstimator;
 class ProxyConfigService;
 class SocketPerformanceWatcherFactory;
 class URLRequestContext;
 class URLRequestInterceptor;
 
 class NET_EXPORT URLRequestContextBuilder {
  public:
@@ skipping 14 matching lines @@
     Type type;
 
     // The max size of the cache in bytes. Default is algorithmically determined
     // based off available disk space.
     int max_size;
 
     // The cache path (when type is DISK).
     base::FilePath path;
   };
 
-  struct NET_EXPORT HttpNetworkSessionParams {
-    HttpNetworkSessionParams();
-    ~HttpNetworkSessionParams();
-
-    // Configutes |params| to match the settings in |this|.
-    // TODO(mmenke):  Temporary utility function. Once everything is using a
-    // URLRequestContextBuilder, can make this no longer publicly accessible.
-    void ConfigureSessionParams(HttpNetworkSession::Params* params) const;
-
-    // These fields mirror those in HttpNetworkSession::Params;
-    HostMappingRules host_mapping_rules;
-    bool ignore_certificate_errors;
-    uint16_t testing_fixed_http_port;
-    uint16_t testing_fixed_https_port;
-    bool enable_http2;
-    bool enable_quic;
-    std::string quic_user_agent_id;
-    int quic_max_server_configs_stored_in_properties;
-    QuicTagVector quic_connection_options;
-    bool quic_close_sessions_on_ip_change;
-    int quic_idle_connection_timeout_seconds;
-    bool quic_migrate_sessions_on_network_change;
-    bool quic_migrate_sessions_early;
-    bool quic_disable_bidirectional_streams;
-    bool quic_race_cert_verification;
-  };
-
   URLRequestContextBuilder();
   virtual ~URLRequestContextBuilder();
 
   // Sets a name for this URLRequestContext. Currently the name is used in
   // MemoryDumpProvier to annotate memory usage. The name does not need to be
   // unique.
   void set_name(const char* name) { name_ = name; }
 
   // Sets whether Brotli compression is enabled.  Disabled by default;
   void set_enable_brotli(bool enable_brotli) { enable_brotli_ = enable_brotli; }
@@ skipping 95 matching lines @@
   // to set another custom one.
   void SetHttpAuthHandlerFactory(
       std::unique_ptr<HttpAuthHandlerFactory> factory);
 
   // By default HttpCache is enabled with a default constructed HttpCacheParams.
   void EnableHttpCache(const HttpCacheParams& params);
   void DisableHttpCache();
 
   // Override default HttpNetworkSession::Params settings.
   void set_http_network_session_params(
-      const HttpNetworkSessionParams& http_network_session_params) {
+      const HttpNetworkSession::Params& http_network_session_params) {
     http_network_session_params_ = http_network_session_params;
   }
 
   void set_transport_security_persister_path(
       const base::FilePath& transport_security_persister_path) {
     transport_security_persister_path_ = transport_security_persister_path;
   }
 
   void SetSpdyAndQuicEnabled(bool spdy_enabled,
                              bool quic_enabled);
@@ skipping 124 matching lines @@
   // Include support for ftp:// requests.
   bool ftp_enabled_;
 #endif
   bool http_cache_enabled_;
   bool throttling_enabled_;
   bool sdch_enabled_;
   bool cookie_store_set_by_client_;
 
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
   HttpCacheParams http_cache_params_;
-  HttpNetworkSessionParams http_network_session_params_;
+  HttpNetworkSession::Params http_network_session_params_;
   base::FilePath transport_security_persister_path_;
   NetLog* net_log_;
   std::unique_ptr<HostResolver> host_resolver_;
   std::unique_ptr<ChannelIDService> channel_id_service_;
   std::unique_ptr<ProxyConfigService> proxy_config_service_;
   std::unique_ptr<ProxyService> proxy_service_;
   std::unique_ptr<NetworkDelegate> network_delegate_;
   std::unique_ptr<ProxyDelegate> proxy_delegate_;
   std::unique_ptr<CookieStore> cookie_store_;
   std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
   std::unique_ptr<CertVerifier> cert_verifier_;
   std::unique_ptr<CTVerifier> ct_verifier_;
   std::vector<std::unique_ptr<URLRequestInterceptor>> url_request_interceptors_;
   std::unique_ptr<HttpServerProperties> http_server_properties_;
   std::map<std::string, std::unique_ptr<URLRequestJobFactory::ProtocolHandler>>
       protocol_handlers_;
   // SocketPerformanceWatcherFactory to be used by this context builder.
   // Not owned by the context builder. Once it is set to a non-null value, it
   // is guaranteed to be non-null during the lifetime of |this|.
   SocketPerformanceWatcherFactory* socket_performance_watcher_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextBuilder);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_CONTEXT_BUILDER_H_