Rename org.chromium.cronet_test_apk to org.chromium.net

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 284 matching lines @@
             'java_in_dir': 'cronet/android/sample/javatests',
             'resource_dir': 'cronet/android/sample/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'cronet_tests_jni_headers',
           'type': 'none',
           'sources': [
-            'cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestUtil.java',
-            'cronet/android/test/src/org/chromium/cronet_test_apk/MockUrlRequestJobFactory.java',
-            'cronet/android/test/src/org/chromium/cronet_test_apk/NativeTestServer.java',
-            'cronet/android/test/src/org/chromium/cronet_test_apk/NetworkChangeNotifierUtil.java',
+            '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/NativeTestServer.java',
+            'cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java',
           ],
           'variables': {
             'jni_gen_package': 'cronet_tests',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libcronet_tests',
           'type': 'shared_library',
           'sources': [
@@ skipping 201 matching lines @@
               'files': [
                 '<(SHARED_LIB_DIR)/<(native_lib)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="android" and use_icu_alternatives_on_android==1
   ],
 }