[Cronet] Run cronet_unittests on iOS bots.

Bug: 640621
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I33516d4a22a9f2da017749f1cf9eb8cd04314725
Reviewed-on: https://chromium-review.googlesource.com/809192Reviewed-by: smut <smut@google.com>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Andrei Kapishnikov <kapishnikov@chromium.org>
Reviewed-by: Miriam Gershenson <mgersh@chromium.org>
Commit-Queue: Andrei Kapishnikov <kapishnikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522034}

components/cronet/ios/BUILD.gn

@@ -148,7 +148,7 @@ ios_framework_bundle("cronet_framework") {
   public_configs = [ ":cronet_include_config" ]
 }
 
-test("cronet_unittests") {
+test("cronet_unittests_ios") {
   testonly = true
 
   sources = [
@@ -162,11 +162,12 @@ test("cronet_unittests") {
     ":cronet_sources_with_global_state",
     "//base",
     "//base/test:test_support",
-    "//components/cronet/ios/test:cronet_test",
     "//components/metrics",
     "//net",
     "//testing/gtest",
   ]
+
+  bundle_deps = [ "//components/cronet/ios/test:cronet_test" ]
 }
 
 action("generate_accept_languages") {

components/cronet/stale_host_resolver_unittest.cc

@@ -4,6 +4,10 @@
 
 #include "components/cronet/stale_host_resolver.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ -13,6 +17,7 @@
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "components/cronet/url_request_context_config.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
@@ -374,7 +379,13 @@ TEST_F(StaleHostResolverTest, CancelWithStaleCache) {
 // CancelWithFreshCache makes no sense; the request would've returned
 // synchronously.
 
-TEST_F(StaleHostResolverTest, StaleUsability) {
+// crbug.com/792173
+#if defined(OS_IOS)
+#define MAYBE_StaleUsability DISABLED_StaleUsability
+#else
+#define MAYBE_StaleUsability StaleUsability
+#endif
+TEST_F(StaleHostResolverTest, MAYBE_StaleUsability) {
   const struct {
     int max_expired_time_sec;
     int max_stale_uses;

components/cronet/tools/cr_cronet.py

@@ -32,8 +32,21 @@ def test(out_dir, extra_options):
   return run(out_dir + '/bin/run_cronet_test_instrumentation_apk ' + \
              extra_options)
 
+
+def unittest(out_dir, extra_options):
+  return run(out_dir + '/bin/run_cronet_unittests ' + \
+             extra_options)
+
+
 def test_ios(out_dir, extra_options):
-  return run(out_dir + '/iossim ' + out_dir + '/cronet_test.app', extra_options)
+  return run(out_dir + '/iossim -c "' + extra_options + '" ' + \
+             out_dir + '/cronet_test.app')
+
+
+def unittest_ios(out_dir, extra_options):
+  return run(out_dir + '/iossim -c "' + extra_options + '" ' + \
+             out_dir + '/cronet_unittests_ios.app')
+
 
 def debug(extra_options):
   return run('build/android/adb_gdb --start ' + \
@@ -57,6 +70,8 @@ def main():
                                'proguard',
                                'test',
                                'build-test',
+                               'unit',
+                               'build-unit',
                                'stack',
                                'debug',
                                'build-debug'])
@@ -79,6 +94,7 @@ def main():
   if is_os:
     target_os = 'ios'
     test_target = 'cronet_test'
+    unit_target = 'cronet_unittests_ios'
     gn_args = 'is_cronet_build=true is_component_build=false ' \
         'use_xcode_clang=true ios_deployment_target="9.0" '
     gn_extra = '--ide=xcode'
@@ -94,6 +110,7 @@ def main():
   else:
     target_os = 'android'
     test_target = 'cronet_test_instrumentation_apk'
+    unit_target = 'cronet_unittests'
     gn_args = 'use_errorprone_java_compiler=true arm_use_neon=false '
     gn_extra = ''
     out_dir_suffix = ''
@@ -143,11 +160,19 @@ def main():
     if (options.command=='build-debug'):
       return build(out_dir, test_target) or install(out_dir) or \
           debug(extra_options)
+    if (options.command=='unit'):
+      return unittest(out_dir, extra_options)
+    if (options.command=='build-unit'):
+      return build(out_dir, unit_target) or unittest(out_dir, extra_options)
   else:
     if (options.command=='test'):
       return test_ios(out_dir, extra_options)
     if (options.command=='build-test'):
       return build(out_dir, test_target) or test_ios(out_dir, extra_options)
+    if (options.command=='unit'):
+      return unittest_ios(out_dir, extra_options)
+    if (options.command=='build-unit'):
+      return build(out_dir, unit_target) or unittest_ios(out_dir, extra_options)
 
   parser.print_help()
   return 1

components/cronet/url_request_context_config_unittest.cc

@@ -100,8 +100,10 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
   // Check race_cert_verification.
   EXPECT_TRUE(params->quic_race_cert_verification);
 
-  // Check AsyncDNS resolver is enabled.
+#if defined(ENABLE_BUILT_IN_DNS)
+  // Check AsyncDNS resolver is enabled (not supported on iOS).
   EXPECT_TRUE(context->host_resolver()->GetDnsConfigAsValue());
+#endif  // defined(ENABLE_BUILT_IN_DNS)
 
   // Check IPv6 is disabled when on wifi.
   EXPECT_TRUE(context->host_resolver()->GetNoIPv6OnWifi());

ios/build/bots/chromium.fyi/ios-simulator-cronet.json

@@ -23,6 +23,12 @@
   "configuration": "Debug",
   "sdk": "iphonesimulator11.0",
   "tests": [
+    {
+      "app": "cronet_unittests_ios",
+      "device type": "iPhone 5s",
+      "os": "9.3",
+      "xcode version": "9.0"
+    },
     {
       "app": "cronet_test",
       "device type": "iPhone 5s",

ios/build/bots/chromium.mac/ios-simulator-cronet.json

@@ -21,10 +21,16 @@
   "configuration": "Debug",
   "sdk": "iphonesimulator11.0",
   "tests": [
+    {
+      "app": "cronet_unittests_ios",
+      "device type": "iPhone 5s",
+      "os": "9.3",
+      "xcode version": "9.0"
+    },
     {
       "app": "cronet_test",
       "device type": "iPhone 5s",
-      "os": "11.0",
+      "os": "9.3",
       "xcode version": "9.0"
     },
     {

testing/buildbot/gn_isolate_map.pyl

@@ -428,6 +428,10 @@
     "label": "//components/cronet/ios/test:cronet_test",
     "type": "raw",
   },
+  "cronet_unittests_ios": {
+    "label": "//components/cronet/ios:cronet_unittests_ios",
+    "type": "raw",
+  },
   "cronet_test_instrumentation_apk": {
     "label": "//components/cronet/android:cronet_test_instrumentation_apk",
     "type": "additional_compile_target",

testing/buildbot/manage.py

@@ -90,6 +90,7 @@ SKIP_GN_ISOLATE_MAP_TARGETS = {
 
   # iOS tests are listed in //ios/build/bots.
   'cronet_test',
+  'cronet_unittests_ios',
   'ios_chrome_bookmarks_egtests',
   'ios_chrome_integration_egtests',
   'ios_chrome_payments_egtests',