Revert of Remove mojo test step from bb_device_steps.py

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 57 matching lines @@
       'ChromeShellTest',
       'chrome:chrome/test/data/android/device_files',
       constants.CHROME_SHELL_HOST_DRIVEN_DIR),
     I('AndroidWebView',
       'AndroidWebView.apk',
       'org.chromium.android_webview.shell',
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files'),
     ])
 
-VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', 'sync',
+VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', 'mojo', 'sync',
                    'telemetry_perf_unittests', 'ui', 'unit', 'webkit',
                    'webkit_layout', 'python_unittests'])
 
 RunCmd = bb_utils.RunCmd
 
 
 def _GetRevision(options):
   """Get the SVN revision number.
 
   Args:
@@ skipping 112 matching lines @@
   """
   InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
   args = ['--browser', 'android-chrome-shell']
   devices = android_commands.GetAttachedDevices()
   if devices:
     args = args + ['--device', devices[0]]
   bb_annotations.PrintNamedStep('telemetry_perf_unittests')
   RunCmd(['tools/perf/run_tests'] + args)
 
 
+def RunMojoTests(options):
+  """Runs the mojo unit tests.
+
+  Args:
+    options: options object.
+  """
+  test = I('MojoTest',
+           None,
+           'org.chromium.mojo.tests',
+           'MojoTest',
+           'bindings:mojo/public/interfaces/bindings/tests/data')
+  RunInstrumentationSuite(options, test)
+
+
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
     print_step: Print a buildbot step
   """
   if print_step:
     bb_annotations.PrintNamedStep('install_%s' % test.name.lower())
@@ skipping 303 matching lines @@
   for suite in constants.PYTHON_UNIT_TEST_SUITES:
     bb_annotations.PrintNamedStep(suite)
     RunCmd(['build/android/test_runner.py', 'python', '-s', suite])
 
 
 def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),
       ('chrome_proxy', RunChromeProxyTests),
       ('gpu', RunGPUTests),
+      ('mojo', RunMojoTests),
       ('python_unittests', RunPythonUnitTests),
       ('sync', RunChromeSyncShellTests),
       ('telemetry_perf_unittests', RunTelemetryPerfUnitTests),
       ('ui', RunInstrumentationTests),
       ('unit', RunUnitTests),
       ('webkit', RunWebkitTests),
       ('webkit_layout', RunWebkitLayoutTests),
   ]
 
 
@@ skipping 183 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))