Enable AndroidWebViewTest and ChromeSyncShellTest instrumentation tests for GN

scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
index c71ac2e970bb619908f285b87b0b5539d8decdcd..4a2168517cd4b76d5cfcaa510e1b9e08dc202da6 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
@@ -227,10 +227,12 @@
       "--goma-dir",
       "[BUILD]/goma",
       "--",
+      "android_webview_test_apk",
       "base_junit_tests",
       "breakpad_unittests_deps",
       "chrome_junit_tests",
       "chrome_public_test_apk",
+      "chrome_sync_shell_test_apk",
       "components_invalidation_impl_junit_tests",
       "components_policy_junit_tests",
       "content_junit_tests",
@@ -427,6 +429,48 @@
   {
     "cmd": [
       "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
+      "-v",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--release"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "install AndroidWebView.apk"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "instrumentation",
+      "--test-apk",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--apk-under-test",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
+      "--isolate-file-path",
+      "android_webview/android_webview_test_apk.isolate",
+      "--flakiness-dashboard-server",
+      "test-results.appspot.com",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "Instrumentation test AndroidWebViewTest",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
       "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk",
       "-v",
       "--blacklist-file",
@@ -510,6 +554,46 @@
   },
   {
     "cmd": [
+      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
+      "-v",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--release"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "install ChromeSyncShell.apk"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "instrumentation",
+      "--test-apk",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.apk",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--apk-under-test",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
+      "--flakiness-dashboard-server",
+      "test-results.appspot.com",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "Instrumentation test ChromeSyncShellTest",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",