Rename Android's cronet_unittests target to cronet_unittests_android.

We are introducing a cross-platform version of cronet_unittests,
initially for Linux, Mac and Fuchsia, so having the special Android-
specific test binary with the same name makes it impossible to set up
the GN isolate mapping correctly.

Bug: 808075
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I104259ab0ab9f3533600665555d67946bb39fcfc
Reviewed-on: https://chromium-review.googlesource.com/933591Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Andrei Kapishnikov <kapishnikov@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538962}

BUILD.gn

@@ -325,7 +325,7 @@ group("gn_all") {
         "//components/cronet/android:cronet_sample_test_apk",
         "//components/cronet/android:cronet_test_apk",
         "//components/cronet/android:cronet_test_instrumentation_apk",
-        "//components/cronet/android:cronet_unittests",
+        "//components/cronet/android:cronet_unittests_android",
       ]
     }
 

components/cronet/android/BUILD.gn

@@ -835,7 +835,7 @@ android_apk("cronet_perf_test_apk") {
   ]
 }
 
-test("cronet_unittests") {
+test("cronet_unittests_android") {
   sources = [
     "//components/cronet/android/cert/cert_verifier_cache_serializer_unittest.cc",
   ]

components/cronet/android/build_instructions.md

@@ -74,7 +74,7 @@ command. For example:
 $ ./components/cronet/tools/cr_cronet.py build-test -f QuicTest#testQuicLoadUrl
 ```
 
-#### Running net_unittests and cronet_unittests
+#### Running net_unittests and cronet_unittests_android
 
 To run C++ and Java unit tests of net/ functionality:
 
@@ -87,8 +87,8 @@ $ ./out/Debug/bin/run_net_unittests --fast-local-dev
 For more information about running net_unittests, read
 [Android Test Instructions](../../../docs/android_test_instructions.md).
 
-There are a small number of C++ Cronet unit tests, called cronet_unittests, that
-can be run by following the above instructions and substituting cronet_unittests
+There are a small number of C++ Cronet unit tests, called cronet_unittests_android, that
+can be run by following the above instructions and substituting cronet_unittests_android
 for net_unittests.
 
 #### Running Cronet performance tests

components/cronet/tools/cr_cronet.py

@@ -34,7 +34,7 @@ def test(out_dir, extra_options):
 
 
 def unittest(out_dir, extra_options):
-  return run(out_dir + '/bin/run_cronet_unittests ' + \
+  return run(out_dir + '/bin/run_cronet_unittests_android ' + \
              extra_options)
 
 
@@ -112,7 +112,7 @@ def main():
   else:
     target_os = 'android'
     test_target = 'cronet_test_instrumentation_apk'
-    unit_target = 'cronet_unittests'
+    unit_target = 'cronet_unittests_android'
     gn_args = 'use_errorprone_java_compiler=true '
     gn_extra = ''
     out_dir_suffix = ''

testing/buildbot/chromium.android.fyi.json

@@ -186,7 +186,7 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "cronet_unittests"
+            "cronet_unittests_android"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
@@ -217,7 +217,7 @@
             }
           ]
         },
-        "test": "cronet_unittests"
+        "test": "cronet_unittests_android"
       },
       {
         "args": [
@@ -294,7 +294,7 @@
         "swarming": {
           "can_use_on_swarming_builders": false
         },
-        "test": "cronet_unittests"
+        "test": "cronet_unittests_android"
       },
       {
         "swarming": {
@@ -489,7 +489,7 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "cronet_unittests"
+            "cronet_unittests_android"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
@@ -520,7 +520,7 @@
             }
           ]
         },
-        "test": "cronet_unittests"
+        "test": "cronet_unittests_android"
       },
       {
         "args": [

testing/buildbot/chromium.android.json

@@ -181,7 +181,7 @@
             }
           ]
         },
-        "test": "cronet_unittests"
+        "test": "cronet_unittests_android"
       },
       {
         "args": [
@@ -249,7 +249,7 @@
         "swarming": {
           "can_use_on_swarming_builders": false
         },
-        "test": "cronet_unittests"
+        "test": "cronet_unittests_android"
       },
       {
         "swarming": {
@@ -429,7 +429,7 @@
             }
           ]
         },
-        "test": "cronet_unittests"
+        "test": "cronet_unittests_android"
       },
       {
         "args": [

testing/buildbot/gn_isolate_map.pyl

@@ -446,6 +446,10 @@
     "label": "//components/cronet/ios/test:cronet_test",
     "type": "raw",
   },
+  "cronet_unittests_android": {
+    "label": "//components/cronet/android:cronet_unittests_android",
+    "type": "console_test_launcher",
+  },
   "cronet_unittests_ios": {
     "label": "//components/cronet/ios:cronet_unittests_ios",
     "type": "raw",
@@ -454,10 +458,6 @@
     "label": "//components/cronet/android:cronet_test_instrumentation_apk",
     "type": "additional_compile_target",
   },
-  "cronet_unittests": {
-    "label": "//components/cronet/android:cronet_unittests",
-    "type": "console_test_launcher",
-  },
   "crypto_unittests": {
     "label": "//crypto:crypto_unittests",
     "type": "console_test_launcher",

testing/buildbot/test_suites.pyl

@@ -740,7 +740,7 @@
         'hard_timeout': 600,
       },
     },
-    'cronet_unittests': {
+    'cronet_unittests_android': {
       'swarming': {
         'hard_timeout': 300,
       },