[Cronet] Replace setExperimentalQuicConnectionOptions with a more general API

components/cronet/url_request_context_config.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/cronet/url_request_context_config.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
+#include "base/json/json_reader.h"

[pauljensen, 2015/11/04 15:03:26]

duplicate line

[xunjieli, 2015/11/06 14:48:51]

Done.

 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
+#include "base/values.h"

[pauljensen, 2015/11/04 15:03:26]

ditto

[xunjieli, 2015/11/06 14:48:51]

Done.

 #include "net/cert/cert_verifier.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_utils.h"
 #include "net/url_request/url_request_context_builder.h"
 
 namespace cronet {
 
 namespace {
 
+// TODO(xunjieli): Refactor constants in io_thread.cc.
+const char kQuicFieldTrialName[] = "QUIC";
+const char kQuicConnectionOptions[] = "connection_options";
+
 // Using a reference to scoped_ptr is unavoidable because of the semantics of
 // RegisterCustomField.
 // TODO(xunjieli): Remove this once crbug.com/544976 is fixed.
 bool GetMockCertVerifierFromString(
     const base::StringPiece& mock_cert_verifier_string,
     scoped_ptr<net::CertVerifier>* result) {
   int64 val;
   bool success = base::StringToInt64(mock_cert_verifier_string, &val);
   *result = make_scoped_ptr(reinterpret_cast<net::CertVerifier*>(val));
   return success;
 }
 
+void ParseAndSetExperimentalOptions(
+    const std::string& experimental_options,
+    net::URLRequestContextBuilder* context_builder) {
+  if (experimental_options.empty())
+    return;
+
+  scoped_ptr<base::DictionaryValue> dict =
+      base::DictionaryValue::From(base::JSONReader::Read(experimental_options));
+  if (!dict) {
+    DCHECK(false) << "Parsing experimental options failed: "
+                  << experimental_options;
+    return;
+  }
+
+  const base::DictionaryValue* quic_args = nullptr;

[pauljensen, 2015/11/04 15:03:26]

I don't think we need this initializer

[xunjieli, 2015/11/06 14:48:51]

But I looked through code search. All the usage of
DictionaryValue::GetDictionary has an initializer like this.

An example: 
https://code.google.com/p/chromium/codesearch#chromium/src/base/trace_event/t...

+  if (dict->GetDictionary(kQuicFieldTrialName, &quic_args)) {
+    std::string quic_connection_options;
+    if (quic_args->GetString(kQuicConnectionOptions,
+                             &quic_connection_options)) {
+      context_builder->set_quic_connection_options(
+          net::QuicUtils::ParseQuicConnectionOptions(quic_connection_options));
+    }
+  }
+}
+
 }  // namespace
 
 #define DEFINE_CONTEXT_CONFIG(x) const char REQUEST_CONTEXT_CONFIG_##x[] = #x;
 #include "components/cronet/url_request_context_config_list.h"
 #undef DEFINE_CONTEXT_CONFIG
 
 URLRequestContextConfig::QuicHint::QuicHint() {
 }
 
 URLRequestContextConfig::QuicHint::~QuicHint() {
@@ skipping 45 matching lines @@
       cache_params.type =
           net::URLRequestContextBuilder::HttpCacheParams::IN_MEMORY;
     }
     cache_params.max_size = http_cache_max_size;
     context_builder->EnableHttpCache(cache_params);
   } else {
     context_builder->DisableHttpCache();
   }
   context_builder->set_user_agent(user_agent);
   context_builder->SetSpdyAndQuicEnabled(enable_spdy, enable_quic);
-  context_builder->set_quic_connection_options(
-      net::QuicUtils::ParseQuicConnectionOptions(quic_connection_options));
   context_builder->set_sdch_enabled(enable_sdch);
+
+  ParseAndSetExperimentalOptions(experimental_options, context_builder);
+
   if (mock_cert_verifier)
     context_builder->SetCertVerifier(mock_cert_verifier.Pass());
   // TODO(mef): Use |config| to set cookies.
 }
 
 // static
 void URLRequestContextConfig::RegisterJSONConverter(
     base::JSONValueConverter<URLRequestContextConfig>* converter) {
   converter->RegisterStringField(REQUEST_CONTEXT_CONFIG_USER_AGENT,
                                  &URLRequestContextConfig::user_agent);
   converter->RegisterStringField(REQUEST_CONTEXT_CONFIG_STORAGE_PATH,
                                  &URLRequestContextConfig::storage_path);
   converter->RegisterBoolField(REQUEST_CONTEXT_CONFIG_ENABLE_QUIC,
                                &URLRequestContextConfig::enable_quic);
   converter->RegisterBoolField(REQUEST_CONTEXT_CONFIG_ENABLE_SPDY,
                                &URLRequestContextConfig::enable_spdy);
   converter->RegisterBoolField(REQUEST_CONTEXT_CONFIG_ENABLE_SDCH,
                                &URLRequestContextConfig::enable_sdch);
   converter->RegisterStringField(REQUEST_CONTEXT_CONFIG_HTTP_CACHE,
                                  &URLRequestContextConfig::http_cache);
   converter->RegisterBoolField(REQUEST_CONTEXT_CONFIG_LOAD_DISABLE_CACHE,
                                &URLRequestContextConfig::load_disable_cache);
   converter->RegisterIntField(REQUEST_CONTEXT_CONFIG_HTTP_CACHE_MAX_SIZE,
                               &URLRequestContextConfig::http_cache_max_size);
   converter->RegisterRepeatedMessage(REQUEST_CONTEXT_CONFIG_QUIC_HINTS,
                                      &URLRequestContextConfig::quic_hints);
   converter->RegisterStringField(
-      REQUEST_CONTEXT_CONFIG_QUIC_OPTIONS,
-      &URLRequestContextConfig::quic_connection_options);
+      REQUEST_CONTEXT_CONFIG_EXPERIMENTAL_OPTIONS,
+      &URLRequestContextConfig::experimental_options);
+

[pauljensen, 2015/11/04 15:03:26]

remove blank line to match style here?

[xunjieli, 2015/11/06 14:48:51]

Done.

   converter->RegisterStringField(
       REQUEST_CONTEXT_CONFIG_DATA_REDUCTION_PRIMARY_PROXY,
       &URLRequestContextConfig::data_reduction_primary_proxy);
   converter->RegisterStringField(
       REQUEST_CONTEXT_CONFIG_DATA_REDUCTION_FALLBACK_PROXY,
       &URLRequestContextConfig::data_reduction_fallback_proxy);
   converter->RegisterStringField(
       REQUEST_CONTEXT_CONFIG_DATA_REDUCTION_SECURE_PROXY_CHECK_URL,
       &URLRequestContextConfig::data_reduction_secure_proxy_check_url);
   converter->RegisterStringField(
       REQUEST_CONTEXT_CONFIG_DATA_REDUCTION_PROXY_KEY,
       &URLRequestContextConfig::data_reduction_proxy_key);
 
   // For Testing.
   converter->RegisterCustomField<scoped_ptr<net::CertVerifier>>(
       REQUEST_CONTEXT_CONFIG_MOCK_CERT_VERIFIER,
       &URLRequestContextConfig::mock_cert_verifier,
       &GetMockCertVerifierFromString);
 }
 
 }  // namespace cronet