remove stale test data on the device

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 2cff5f25e2f3ead5d057eade47337ddac1f0698b..09a6622e6691740aa1a1a888bac70d18c816b274 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -221,6 +221,9 @@ def AddGTestOptions(parser):
   group.add_argument('--app-data-file-dir',
                      help='Host directory to which app data files will be'
                           ' saved. Used with --app-data-file.')
+  group.add_argument('--delete-stale-data', dest='delete_stale_data',
+                     action='store_true',
+                     help='Delete stale test data on the device.')
 
   filter_group = group.add_mutually_exclusive_group()
   filter_group.add_argument('-f', '--gtest_filter', '--gtest-filter',
@@ -341,6 +344,9 @@ def AddInstrumentationTestOptions(parser):
                      dest='isolate_file_path',
                      help='.isolate file path to override the default '
                           'path')
+  group.add_argument('--delete-stale-data', dest='delete_stale_data',
+                     action='store_true',
+                     help='Delete stale test data on the device.')
 
   AddCommonOptions(parser)
   AddDeviceOptions(parser)
@@ -394,7 +400,8 @@ def ProcessInstrumentationOptions(args):
       args.test_support_apk_path,
       args.device_flags,
       args.isolate_file_path,
-      args.set_asserts
+      args.set_asserts,
+      args.delete_stale_data
       )
 
 
@@ -648,7 +655,8 @@ def _RunGTests(args, devices):
         args.isolate_file_path,
         suite_name,
         args.app_data_files,
-        args.app_data_file_dir)
+        args.app_data_file_dir,
+        args.delete_stale_data)
     runner_factory, tests = gtest_setup.Setup(gtest_options, devices)
 
     results, test_exit_code = test_dispatcher.RunTests(