[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 6e22078a38b914d182558c65371ffc92eeb4bab2..fa4606d02a799b675371a9411e1b98da90dca306 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -41,10 +41,10 @@
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
-          'target_name': 'cronet_url_request_context_config_list',
+          'target_name': 'cronet_engine_builder_list',
           'type': 'none',
           'sources': [
-            'cronet/android/java/src/org/chromium/net/UrlRequestContextConfigList.template',
+            'cronet/android/java/src/org/chromium/net/CronetEngineBuilderList.template',
           ],
           'variables': {
             'package_name': 'org/chromium/cronet',
@@ -206,7 +206,7 @@
           'target_name': 'cronet_api',
           'type': 'none',
           'dependencies': [
-            'cronet_url_request_context_config_list',
+            'cronet_engine_builder_list',
             'cronet_version',
             'load_states_list',
           ],
@@ -214,6 +214,8 @@
             'java_in_dir': 'cronet/android/java',
             'javac_includes': [
               '**/ChunkedWritableByteChannel.java',
+              '**/CronetEngine.java',
+              '**/CronetEngineBuilderList.java',
               '**/ExtendedResponseInfo.java',
               '**/HistogramManager.java',
               '**/HttpUrlConnection*.java',
@@ -224,9 +226,6 @@
               '**/UploadDataProvider.java',
               '**/UploadDataSink.java',
               '**/UrlRequest.java',
-              '**/UrlRequestContext.java',
-              '**/UrlRequestContextConfig.java',
-              '**/UrlRequestContextConfigList.java',
               '**/UrlRequestException.java',
               '**/UrlRequestListener.java',
               '**/UserAgent.java',