Add chrome_proxy tests to Android tester.

build/android/buildbot/bb_device_steps.py

Index: build/android/buildbot/bb_device_steps.py
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 1d0ba35fff139a91054d01bf46ae16ff7c710ec9..05160524b860f12eecd9939a109e4727326a097f 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -74,9 +74,9 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
       'webview:android_webview/test/data/device_files'),
     ])
 
-VALID_TESTS = set(['chromedriver', 'gpu', 'mojo', 'telemetry_perf_unittests',
-                   'ui', 'unit', 'webkit', 'webkit_layout', 'webrtc_chromium',
-                   'webrtc_native'])
+VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', 'mojo',
+                   'telemetry_perf_unittests', 'ui', 'unit', 'webkit',
+                   'webkit_layout', 'webrtc_chromium', 'webrtc_native'])
 
 RunCmd = bb_utils.RunCmd
 
@@ -140,6 +140,19 @@ def RunChromeDriverTests(options):
           '--revision=%s' % _GetRevision(options),
           '--update-log'])
 
+def RunChromeProxyTests(options):
+  """Run the chrome_proxy tests.
+
+  Args:
+    options: options object.
+  """
+  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('chrome_proxy')
+  RunCmd(['tools/chrome_proxy/run_tests'] + args)
 
 def RunTelemetryPerfUnitTests(options):
   """Runs the telemetry perf unit tests.
@@ -496,6 +509,7 @@ def RunGPUTests(options):
 def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),
+      ('chrome_proxy', RunChromeProxyTests),
       ('gpu', RunGPUTests),
       ('mojo', RunMojoTests),
       ('telemetry_perf_unittests', RunTelemetryPerfUnitTests),