Merge UrlRequest.java into ChromiumUrlRequest.java

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" and use_icu_alternatives_on_android==1', {
       # TODO(mef): Figure out what needs to be done for gn script.
       'targets': [
         {
           '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',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           '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' ],
         },
         {
           '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' ],
         },
         {
           'target_name': 'cronet_url_request_context_config_list',
           'type': 'none',
           'sources': [
             'cronet/android/java/src/org/chromium/net/UrlRequestContextConfig.template',
           ],
           'variables': {
@@ skipping 50 matching lines @@
             'cronet_url_request_context_config_list',
             'cronet_url_request_error_list',
             'cronet_url_request_priority_list',
             'cronet_version',
             '../net/net.gyp:net',
           ],
           'sources': [
             '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',
             'cronet/android/url_request_context_adapter.h',
             'cronet/android/wrapped_channel_upload_element_reader.cc',
             'cronet/android/wrapped_channel_upload_element_reader.h',
           ],
           'cflags': [
             '-DLOGGING=1',
             '-fdata-sections',
@@ skipping 52 matching lines @@
             '../base/base.gyp:base',
             'cronet_stub',
             'cronet_url_request_error_list',
             'cronet_url_request_priority_list',
             'libcronet',
           ],
           'variables': {
             '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',
             ],
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'cronet_package',
           'type': 'none',
           'dependencies': [
             'libcronet',
@@ skipping 163 matching lines @@
             'java_in_dir': 'cronet/android/sample/javatests',
             'resource_dir': 'cronet/android/sample/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ],
 }