Add functionality for Android.

tools/chrome_proxy/webdriver/common.py

 # Copyright 2016 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 argparse
 import json
 import os
 import re
 import shlex
 import sys
@@ skipping 14 matching lines @@
   Returns:
     A new Namespace object with class properties for each argument added below.
     See pydoc for argparse.
   """
   parser = argparse.ArgumentParser()
   parser.add_argument('--browser_args', nargs=1, type=str, help='Override '
     'browser flags in code with these flags')
   parser.add_argument('--via_header_value', metavar='via_header', nargs=1,
     default='1.1 Chrome-Compression-Proxy', help='What the via should match to '
     'be considered valid')
+  parser.add_argument('--android', help='If given, attempts to run the test on '
+    'Android via adb. Ignores usage of --chrome_exec', action='store_true')
+  parser.add_argument('--android_package', nargs=1,
+    default='com.android.chrome', help='Set the android package for Chrome')
   parser.add_argument('--chrome_exec', nargs=1, type=str, help='The path to '
     'the Chrome or Chromium executable')
   parser.add_argument('chrome_driver', nargs=1, type=str, help='The path to '
     'the ChromeDriver executable. If not given, the default system chrome '
     'will be used.')
   # TODO(robertogden): Log sys.argv here.
   return parser.parse_args(sys.argv[1:])
 
 def HandleException(test_name=None):
   """Writes the exception being handled and a stack trace to stderr.
@@ skipping 58 matching lines @@
           original_args[GetDictKey(arg)] = arg
       # Override flags given in code with any command line arguments.
       for override_arg in shlex.split(self._flags.browser_args[0]):
         arg_key = GetDictKey(override_arg)
         if arg_key in original_args:
           self._chrome_args.remove(original_args[arg_key])
         self._chrome_args.add(override_arg)
 
   def _StartDriver(self):
     """Parses the flags to pass to Chromium, then starts the ChromeDriver.
+
+    If running Android, the Android package name is passed to ChromeDriver here.
     """
     self._OverrideChromeArgs()
-    options = Options()
-    for arg in self._chrome_args:
-      options.add_argument(arg)
-    capabilities = {'loggingPrefs': {'performance': 'INFO'}}
-    if self._flags.chrome_exec:
+    capabilities = {
+      'loggingPrefs': {'performance': 'INFO'},
+      'chromeOptions': {
+        'args': list(self._chrome_args)
+      }
+    }
+    if self._flags.chrome_exec and not self._flags.android:
       capabilities['chrome.binary'] = self._flags.chrome_exec
+    if self._flags.android:

[RyanSturm, 2016/12/06 22:32:15]

Switch these cases around so you don't need to check .android twice:
if self._flags.android:
  ....
elif self._flags.chrome_exec:
  .....

[Robert Ogden, 2016/12/06 22:43:29]

Done.

+      capabilities['chromeOptions'].update({
+        'androidPackage': self._flags.android_package,
+      })
     driver = webdriver.Chrome(executable_path=self._flags.chrome_driver[0],
-      chrome_options=options, desired_capabilities=capabilities)
+      desired_capabilities=capabilities)
     driver.command_executor._commands.update({
       'getAvailableLogTypes': ('GET', '/session/$sessionId/log/types'),
       'getLog': ('POST', '/session/$sessionId/log')})
     self._driver = driver
 
   def _StopDriver(self):
     """Nicely stops the ChromeDriver.
     """
     self._driver.quit()
     self._driver = None
@@ skipping 223 matching lines @@
     """
     sys.stderr.write("**************************************\n")
     sys.stderr.write("**************************************\n")
     sys.stderr.write("**                                  **\n")
     sys.stderr.write("**          TEST FAILURE            **\n")
     sys.stderr.write("**                                  **\n")
     sys.stderr.write("**************************************\n")
     sys.stderr.write("**************************************\n")
     sys.stderr.write(msg, '\n')
     sys.exit(1)