Misc Chromedriver bot fixes.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import sys
@@ skipping 925 matching lines @@
                   print l
               os.remove(report)
          """,
          args=[self.m.path['checkout'].join('out',
                                             self.m.chromium.c.BUILD_CONFIG,
                                             'test_logs',
                                             '*.log')],
     )
 
   def common_tests_setup_steps(self, perf_setup=False,
-                               remove_system_webview=False):
+                               remove_system_webview=False, skip_wipe=False):
     self.create_adb_symlink()
     if self.c.gce_setup:
       self.launch_gce_instances(snapshot=self.c.gce_snapshot,
                                 count=self.c.gce_count)
       self.spawn_logcat_monitor()
       self.provision_devices(emulators=True,
                              remove_system_webview=remove_system_webview)
     else:
       self.spawn_logcat_monitor()
       self.authorize_adb_devices()
       self.device_recovery()
       if perf_setup:
         kwargs = {
             'min_battery_level': 95,
             'disable_network': True,
             'disable_java_debug': True,
             'max_battery_temp': 350}
       else:
         kwargs = {}
+      if skip_wipe:
+        kwargs['skip_wipe'] = True
       self.provision_devices(remove_system_webview=remove_system_webview,
                              **kwargs)
       self.device_status()
       if self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
         self.asan_device_setup()
 
       self.spawn_device_monitor()
 
   def common_tests_final_steps(self, logcat_gs_bucket='chromium-android'):
     if not self.c.gce_setup:
@@ skipping 408 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)