Merge UrlRequest.java into ChromiumUrlRequest.java

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 502b45b015c7a1f3eebeadbca7705a2c632a550b..a68819dbe0cd9a739f31d24dd1dea95a0d1749aa 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -11,8 +11,8 @@
           'target_name': 'cronet_jni_headers',
           'type': 'none',
           'sources': [
-            'cronet/android/java/src/org/chromium/net/UrlRequest.java',
-            'cronet/android/java/src/org/chromium/net/UrlRequestContext.java',
+            'cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java',
+            'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java',
           ],
           'variables': {
             'jni_gen_package': 'cronet',
@@ -23,11 +23,11 @@
           'target_name': 'cronet_url_request_error_list',
           'type': 'none',
           'sources': [
-            'cronet/android/java/src/org/chromium/net/UrlRequestError.template',
+            'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template',
           ],
           'variables': {
             'package_name': 'org/chromium/cronet',
-            'template_deps': ['cronet/android/org_chromium_net_UrlRequest_error_list.h'],
+            'template_deps': ['cronet/android/chromium_url_request_error_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
@@ -35,11 +35,11 @@
           'target_name': 'cronet_url_request_priority_list',
           'type': 'none',
           'sources': [
-            'cronet/android/java/src/org/chromium/net/UrlRequestPriority.template',
+            'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestPriority.template',
           ],
           'variables': {
             'package_name': 'org/chromium/cronet',
-            'template_deps': ['cronet/android/org_chromium_net_UrlRequest_priority_list.h'],
+            'template_deps': ['cronet/android/chromium_url_request_priority_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
@@ -110,14 +110,13 @@
             'cronet/url_request_context_config.cc',
             'cronet/url_request_context_config.h',
             'cronet/url_request_context_config_list.h',
+            'cronet/android/chromium_url_request.cc',
+            'cronet/android/chromium_url_request.h',
+            'cronet/android/chromium_url_request_error_list.h',
+            'cronet/android/chromium_url_request_priority_list.h',
+            'cronet/android/chromium_url_request_context.cc',
+            'cronet/android/chromium_url_request_context.h',
             'cronet/android/cronet_jni.cc',
-            'cronet/android/org_chromium_net_UrlRequest.cc',
-            'cronet/android/org_chromium_net_UrlRequest.h',
-            'cronet/android/org_chromium_net_UrlRequest_error_list.h',
-            'cronet/android/org_chromium_net_UrlRequest_priority_list.h',
-            'cronet/android/org_chromium_net_UrlRequestContext.cc',
-            'cronet/android/org_chromium_net_UrlRequestContext.h',
-            'cronet/android/org_chromium_net_UrlRequestContext_config_list.h',
             'cronet/android/url_request_adapter.cc',
             'cronet/android/url_request_adapter.h',
             'cronet/android/url_request_context_adapter.cc',
@@ -190,13 +189,11 @@
             'java_in_dir': 'cronet/android/java',
             'javac_includes': [
               '**/ChromiumUrlRequest.java',
+              '**/ChromiumUrlRequestContext.java',
+              '**/ChromiumUrlRequestError.java',
               '**/ChromiumUrlRequestFactory.java',
+              '**/ChromiumUrlRequestPriority.java',
               '**/LibraryLoader.java',
-              # TODO(mef): Merge UrlRequest*.java into ChromiumUrlRequest*.java
-              '**/UrlRequest.java',
-              '**/UrlRequestContext.java',
-              '**/UrlRequestError.java',
-              '**/UrlRequestPriority.java',
               '**/UsedByReflection.java',
             ],
           },