Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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 collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 127 matching lines @@
   if not suites_options:
     suites_options = {}
 
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   if options.gtest_filter:
     args.append('--gtest-filter=%s' % options.gtest_filter)
+  if options.flakiness_server:
+    args.append('--flakiness-dashboard-server=%s' %
+                options.flakiness_server)
 
   for suite in suites:
     bb_annotations.PrintNamedStep(suite)
     cmd = [suite] + args
     cmd += suites_options.get(suite, [])
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
     _RunTest(options, cmd, suite)
 
 
@@ skipping 21 matching lines @@
   if devices:
     args = args + ['--device', devices[0]]
   bb_annotations.PrintNamedStep('chrome_proxy')
   RunCmd(['tools/chrome_proxy/run_tests'] + args)
 
 def RunChromeSyncShellTests(options):
   """Run the chrome sync shell tests"""
   test = I('ChromeSyncShell',
            'ChromeSyncShell.apk',
            'org.chromium.chrome.browser.sync',
-           'ChromeSyncShellTest.apk',
+           'ChromeSyncShellTest',
            'chrome:chrome/test/data/android/device_files')
   RunInstrumentationSuite(options, test)
 
 def RunTelemetryPerfUnitTests(options):
   """Runs the telemetry perf unit tests.
 
   Args:
     options: options object.
   """
   InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
@@ skipping 532 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))