Revert of [Cronet] Remove JSON serialization of CronetEngine.Builder

components/cronet.gypi

 # 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.
 
 {
   'conditions': [
     ['OS=="android"', {
       # TODO(mef): Figure out what needs to be done for gn script.
       'targets': [
         {
@@ skipping 30 matching lines @@
         },
         {
           'target_name': 'network_quality_observations_java',
           'type': 'none',
           'variables': {
             'source_file': '../net/base/network_quality_estimator.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
-          'target_name': 'http_cache_type_java',
+          'target_name': 'cronet_engine_builder_list',
           'type': 'none',
+          'sources': [
+            'cronet/android/java/src/org/chromium/net/CronetEngineBuilderList.template',
+          ],
           'variables': {
-            'source_file': 'cronet/url_request_context_config.h',
+            'package_name': 'org/chromium/net',
+            'template_deps': ['cronet/url_request_context_config_list.h'],
           },
-          'includes': [ '../build/android/java_cpp_enum.gypi' ],
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
           'target_name': 'load_states_list',
           'type': 'none',
           'sources': [
             'cronet/android/java/src/org/chromium/net/LoadState.template',
           ],
           'variables': {
             'package_name': 'org/chromium/cronet',
             'template_deps': ['../net/base/load_states_list.h'],
@@ skipping 136 matching lines @@
             'cronet_static_small',
             '../base/base.gyp:base',
             '../net/net.gyp:net_small',
           ],
         },
         { # cronet_api.jar defines Cronet API and provides implementation of
           # legacy api using HttpUrlConnection (not the Chromium stack).
           'target_name': 'cronet_api',
           'type': 'none',
           'dependencies': [
-            'http_cache_type_java',
+            'cronet_engine_builder_list',
             'cronet_version',
             'load_states_list',
             'network_quality_observations_java',
             '../third_party/android_tools/android_tools.gyp:android_support_annotations_javalib',
           ],
           'variables': {
             'java_in_dir': 'cronet/android/api',
             'run_findbugs': 1,
           },
           'includes': [ '../build/java.gypi' ],
@@ skipping 93 matching lines @@
           'type': 'none',
           'sources': [
             'cronet/android/test/src/org/chromium/net/CronetTestUtil.java',
             'cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.java',
             'cronet/android/test/src/org/chromium/net/MockCertVerifier.java',
             'cronet/android/test/src/org/chromium/net/NativeTestServer.java',
             'cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java',
             'cronet/android/test/src/org/chromium/net/QuicTestServer.java',
             'cronet/android/test/src/org/chromium/net/SdchObserver.java',
             'cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.java',
-            'cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java',
           ],
           'variables': {
             'jni_gen_package': 'cronet_tests',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libcronet_tests',
           'type': 'shared_library',
           'sources': [
             'cronet/android/test/cronet_test_jni.cc',
             'cronet/android/test/mock_cert_verifier.cc',
             'cronet/android/test/mock_cert_verifier.h',
             'cronet/android/test/mock_url_request_job_factory.cc',
             'cronet/android/test/mock_url_request_job_factory.h',
             'cronet/android/test/native_test_server.cc',
             'cronet/android/test/native_test_server.h',
             'cronet/android/test/quic_test_server.cc',
             'cronet/android/test/quic_test_server.h',
             'cronet/android/test/sdch_test_util.cc',
             'cronet/android/test/sdch_test_util.h',
             'cronet/android/test/test_upload_data_stream_handler.cc',
             'cronet/android/test/test_upload_data_stream_handler.h',
             'cronet/android/test/network_change_notifier_util.cc',
             'cronet/android/test/network_change_notifier_util.h',
-            'cronet/android/test/cronet_url_request_context_config_test.cc',
-            'cronet/android/test/cronet_url_request_context_config_test.h',
           ],
           'dependencies': [
             'cronet_tests_jni_headers',
             '../base/base.gyp:base',
             '../net/net.gyp:net',
             '../net/net.gyp:net_quic_proto',
             '../net/net.gyp:net_test_support',
             '../net/net.gyp:simple_quic_tools',
             '../base/base.gyp:base_i18n',
             '../third_party/icu/icu.gyp:icui18n',
@@ skipping 259 matching lines @@
             },
           ],
         },
       ],
       'variables': {
         'enable_data_reduction_proxy_support%': 0,
       },
     }],  # OS=="android"
   ],
 }