Make ParseAndSetExperimentalOptions() a member of URLRequestContextConfig

components/cronet/url_request_context_config.h

 // 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.
 
 #ifndef COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_
 #define COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 12 matching lines @@
 namespace net {
 class CertVerifier;
 class NetLog;
 class URLRequestContextBuilder;
 }  // namespace net
 
 namespace cronet {
 
 // Common configuration parameters used by Cronet to configure
 // URLRequestContext.
+// TODO(mgersh): This shouldn't be a struct. Refactor into a struct that holds
+// the data and a class that handles the logic and holds the struct, or some
+// other more reasonable way of passing around configuration.
 struct URLRequestContextConfig {
   // Type of HTTP cache.
   // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net.impl
   enum HttpCacheType {
     // No HTTP cache.
     DISABLED,
     // HTTP cache persisted to disk.
     DISK,
     // HTTP cache kept in memory.
     MEMORY,
@@ skipping 62 matching lines @@
       // MockCertVerifier to use for testing purposes.
       std::unique_ptr<net::CertVerifier> mock_cert_verifier,
       // Enable network quality estimator.
       bool enable_network_quality_estimator,
       // Enable bypassing of public key pinning for local trust anchors
       bool bypass_public_key_pinning_for_local_trust_anchors,
       // Certificate verifier cache data.
       const std::string& cert_verifier_data);
   ~URLRequestContextConfig();
 
+  // Parses experimental options and makes appropriate changes to settings in
+  // the URLRequestContextConfig and URLRequestContextBuilder.
+  void ParseAndSetExperimentalOptions(

[kapishnikov, 2017/06/20 19:34:08]

This method looks internal to URLRequestContextConfig and should not exposed as
public. What other code is going to use it rather than
ConfigureURLRequestContextBuilder()?

[mgersh, 2017/06/20 21:33:57]

Made it private.

+      net::URLRequestContextBuilder* context_builder,
+      net::NetLog* net_log,
+      const scoped_refptr<base::SequencedTaskRunner>& file_task_runner);
+
   // Configures |context_builder| based on |this|.
   void ConfigureURLRequestContextBuilder(
       net::URLRequestContextBuilder* context_builder,
       net::NetLog* net_log,
       const scoped_refptr<base::SequencedTaskRunner>& file_task_runner);
 
   // Enable QUIC.
   const bool enable_quic;
   // QUIC User Agent ID.
   const std::string quic_user_agent_id;
@@ skipping 34 matching lines @@
   // Data to populte CertVerifierCache.
   const std::string cert_verifier_data;
 
   // App-provided list of servers that support QUIC.
   ScopedVector<QuicHint> quic_hints;
 
   // The list of public key pins.
   ScopedVector<Pkp> pkp_list;
 
   // Experimental options that are recognized by the config parser.
-  std::unique_ptr<base::DictionaryValue> effective_experimental_options;
+  std::unique_ptr<base::DictionaryValue> effective_experimental_options =
+      nullptr;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextConfig);
 };
 
 // Stores intermediate state for URLRequestContextConfig.  Initializes with
 // (mostly) sane defaults, then the appropriate member variables can be
 // modified, and it can be finalized with Build().
 struct URLRequestContextConfigBuilder {
   URLRequestContextConfigBuilder();
@@ skipping 46 matching lines @@
   // Data to populate CertVerifierCache.
   std::string cert_verifier_data = "";
 
  private:
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextConfigBuilder);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_