Properly pass bundle smoke test flags to bundle under test

Before, the flags were passed to the test APK.

+ Fix flags to make bundle smoke test run.

Bug: 989654
Change-Id: I175b57af7b0c0ad9badb5d16b341f0eae4b8369a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1795311Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695396}

build/config/android/internal_rules.gni

@@ -796,8 +796,8 @@ template("test_runner_script") {
       }
     }
 
-    if (defined(invoker.command_line_args)) {
-      executable_args += invoker.command_line_args
+    if (defined(invoker.extra_args)) {
+      executable_args += invoker.extra_args
     }
   }
 }

build/config/android/rules.gni

@@ -3567,10 +3567,10 @@ if (enable_java_templates) {
   #   The following args are optional:
   #   apk_under_test: The target being tested.
   #   additional_apks: Additional targets to install on device.
-  #   command_line_args: Command line arguments to set for APK under test.
   #   data: List of runtime data file dependencies.
   #   data_deps: List of non-linked dependencies.
   #   deps: List of private dependencies.
+  #   extra_args: Extra arguments set for test runner.
   #   ignore_all_data_deps: Don't build data_deps and additional_apks.
   #   modules: Extra dynamic feature modules to install for test target. Can
   #     only be used if |apk_under_test| is an Android app bundle.
@@ -3613,10 +3613,10 @@ if (enable_java_templates) {
                                [
                                  "additional_apks",
                                  "apk_under_test",
-                                 "command_line_args",
                                  "data",
                                  "data_deps",
                                  "deps",
+                                 "extra_args",
                                  "ignore_all_data_deps",
                                  "modules",
                                  "proguard_enabled",
@@ -3821,10 +3821,10 @@ if (enable_java_templates) {
                              [
                                "additional_apks",
                                "apk_under_test",
-                               "command_line_args",
                                "data",
                                "data_deps",
                                "deps",
+                               "extra_args",
                                "ignore_all_data_deps",
                                "modules",
                                "never_incremental",

chrome/android/BUILD.gn

@@ -2152,9 +2152,16 @@ instrumentation_test_runner("monochrome_public_bundle_smoke_test") {
   android_test_apk_name = "ChromeBundleSmokeTest"
   never_incremental = true
   modules = [ "test_dummy" ]
-  command_line_args = [
+  extra_args = [
+    # Make extra args be passed through to the bundle under test (see below).
+    "--use-apk-under-test-flags-file",
+
+    # Chrome crashes at startup if strict mode is turned on.
+    "--strict-mode=off",
+
+    # These args are passed through to the bundle under test.
     "--enable-test-dummy-module",
-    "--no-fre",
+    "--disable-fre",
   ]
 }