Add gfx_unittests to Android test (dbg, rel) bots.

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_android_dbg_ng.json

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_android_dbg_ng.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_android_dbg_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_android_dbg_ng.json
index 334fb3a925a3578ee9de4e1a0078e768a53437aa..a132cba5db023c27979fec2aa7431ec7fc13eb47 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_android_dbg_ng.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_android_dbg_ng.json
@@ -181,11 +181,12 @@
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ui_android_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_shell_test_apk\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"sandbox_linux_unittests_deps\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gfx_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome_shell_test_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"sandbox_linux_unittests_deps\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_browsertests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"media_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"breakpad_unittests_deps\", @@@",
@@ -212,6 +213,7 @@
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"device_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gfx_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
@@ -242,6 +244,7 @@
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"device_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gfx_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
@@ -272,6 +275,7 @@
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"device_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gfx_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
@@ -302,6 +306,7 @@
       "@@@STEP_LOG_LINE@analyze_details@    \"content_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"device_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"events_unittests_apk\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"gfx_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gpu_unittests_apk\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"ipc_tests_apk\", @@@",
@@ -394,11 +399,12 @@
       "events_unittests_apk",
       "ui_android_unittests_apk",
       "content_shell_test_apk",
-      "sandbox_linux_unittests_deps",
+      "gfx_unittests_apk",
       "gpu_unittests_apk",
       "content_unittests_apk",
       "chrome_shell_test_apk",
       "gl_tests_apk",
+      "sandbox_linux_unittests_deps",
       "content_browsertests_apk",
       "media_unittests_apk",
       "breakpad_unittests_deps",
@@ -794,6 +800,24 @@
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "gtest",
       "-s",
+      "gfx_unittests",
+      "--verbose",
+      "--flakiness-dashboard-server=http://test-results.appspot.com",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "gfx_unittests (with patch)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
       "gl_tests",
       "--verbose",
       "--flakiness-dashboard-server=http://test-results.appspot.com",