[Recipe Modules] remove_file_on_device was in all flavors except DefaultFlavor

Bug: skia:8901
Change-Id: Idde99d943c31ae62fcd0bc3f3b8cfc0ebc07e896
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203340
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

infra/bots/recipe_modules/flavor/default.py

@@ -143,6 +143,10 @@ class DefaultFlavor(object):
     """Reads the specified file."""
     return self.m.file.read_text('read %s' % path, path)
 
+  def remove_file_on_device(self, path):
+    """Removes the specified file."""
+    return self.m.file.remove('remove %s' % path, path)
+
   def install(self):
     """Run device-specific installation steps."""
     pass

infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json

@@ -50,16 +50,35 @@
       "-t",
       "foo@127.0.0.1",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "env": {
       "CHROME_HEADLESS": "1",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "ssh",
+      "-oConnectTimeout=15",
+      "-oBatchMode=yes",
+      "-t",
+      "-t",
+      "foo@127.0.0.1",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json

@@ -68,7 +68,7 @@
       "adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -76,9 +76,25 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json

@@ -50,16 +50,35 @@
       "-t",
       "foo@127.0.0.1",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "env": {
       "CHROME_HEADLESS": "1",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "ssh",
+      "-oConnectTimeout=15",
+      "-oBatchMode=yes",
+      "-t",
+      "-t",
+      "foo@127.0.0.1",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OpenCL.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-ASAN.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json

@@ -7,11 +7,24 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "file.text",
+      "file.txt",
       "/path/to/tmp/"
     ],
     "infra_step": true,
-    "name": "read file.text"
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "file.txt"
+    ],
+    "infra_step": true,
+    "name": "remove file.txt"
   },
   {
     "cmd": [

infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json

@@ -34,7 +34,7 @@
       "/usr/bin/adb.1.0.35",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/usr/bin/adb.1.0.35",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json

@@ -34,7 +34,7 @@
       "/opt/infra-android/tools/adb",
       "shell",
       "cat",
-      "file.text"
+      "file.txt"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {
@@ -43,9 +43,26 @@
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "read file.text",
+    "name": "read file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "rm",
+      "-f",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json

@@ -15,16 +15,28 @@
   {
     "cmd": [
       "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
-      "file.text"
+      "file.txt"
     ],
     "env": {
       "CHROME_HEADLESS": "1",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "cat_file file.text",
+    "name": "cat_file file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+      "file.txt"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json

@@ -15,16 +15,28 @@
   {
     "cmd": [
       "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
-      "file.text"
+      "file.txt"
     ],
     "env": {
       "CHROME_HEADLESS": "1",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "infra_step": true,
-    "name": "cat_file file.text",
+    "name": "cat_file file.txt",
     "stdout": "/path/to/tmp/"
   },
+  {
+    "cmd": [
+      "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+      "file.txt"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt"
+  },
   {
     "cmd": [
       "python",

infra/bots/recipe_modules/flavor/examples/full.py

@@ -37,7 +37,8 @@ def RunSteps(api):
   if 'Build' not in api.properties['buildername']:
     try:
       api.flavor.copy_file_to_device('file.txt', 'file.txt')
-      api.flavor.read_file_on_device('file.text')
+      api.flavor.read_file_on_device('file.txt')
+      api.flavor.remove_file_on_device('file.txt')
       api.flavor.create_clean_host_dir('results_dir')
       api.flavor.create_clean_device_dir('device_results_dir')
       if 'Lottie' in api.properties['buildername']: