[recipes] Increase test coverage

infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json

Index: infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json
similarity index 81%
copy from infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
copy to infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json
index 9d1e16ca839c193ea8f0b65ff4765be647e5185c..8a4883a0766234bdb60562dd190688c48e99d4ef 100644
--- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json
@@ -56,59 +56,6 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
-      "root"
-    ],
-    "env": {
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "adb root",
-    "stdout": "/path/to/tmp/"
-  },
-  {
-    "cmd": [
-      "sleep",
-      "10"
-    ],
-    "env": {
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "wait"
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
-    ],
-    "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "SKIA_ANDROID_VERBOSE_SETUP": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "wait for device (2)"
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
-    ],
-    "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "SKIA_ANDROID_VERBOSE_SETUP": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "wait for charge (2)"
-  },
-  {
-    "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia",
       "--verbose"
     ],
@@ -126,19 +73,6 @@
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
-      "stop"
-    ],
-    "env": {
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "stop shell"
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
-      "shell",
       "dumpsys",
       "batteryproperties"
     ],
@@ -151,34 +85,6 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
-      "shell",
-      "cat",
-      "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
-    ],
-    "env": {
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "cat scaling_governor"
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
-      "shell",
-      "cat",
-      "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
-    ],
-    "env": {
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "cat cpu_freq"
-  },
-  {
-    "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed",
       "--verbose",
       "[SLAVE_BUILD]/skia/resources",
@@ -359,6 +265,7 @@
       "~blurroundrect",
       "~patch_grid",
       "~desk_carsvg",
+      "~shapes_",
       "~inc0.gif",
       "~inc1.gif",
       "~incInterlaced.gif",
@@ -393,9 +300,9 @@
       "cpu_or_gpu",
       "GPU",
       "cpu_or_gpu_value",
-      "Tegra3",
+      "Mali400",
       "model",
-      "Nexus7",
+      "GalaxyS3",
       "os",
       "Android"
     ],
@@ -414,7 +321,7 @@
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data",
+      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release/data",
       "511"
     ],
     "name": "makedirs perf_dir",
@@ -436,7 +343,7 @@
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed",
       "--verbose",
       "/storage/emulated/legacy/skiabot/skia_perf",
-      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data"
+      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release/data"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
@@ -498,7 +405,7 @@
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "wait for device (3)"
+    "name": "wait for device (2)"
   },
   {
     "cmd": [
@@ -512,7 +419,7 @@
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "wait for charge (3)"
+    "name": "wait for charge (2)"
   },
   {
     "cmd": [