Allow custom package names for Chrome Android

1. [wptrunner] chrome_android now honours (and requires) the
   --package-name flag instead of hardcoding the package name.
2. [wpt] chrome_android now chooses the correct official package name
   depending on the channel.
3. [wpt] chrome_android correctly sets browser_version.
4. [wpt] drive-by change: update the logic for adding --binary-arg &
   --webdriver-arg in chrome & chrome_android (now they both add
   --enable-experimental... to binary_arg and --disable-build-check to
   webdriver_arg when running dev or canary channel).

Author: Hexcles

docs/running-tests/chrome_android.md

@@ -10,14 +10,13 @@ Currently, Android support is a prototype with some known issues:
 * If you have previously run `./wpt run` against Chrome, you might need to
   remove `_venv/bin/chromedriver` so that we can install the correct
   ChromeDriver corresponding to your Chrome for Android version.
-* The package name is hard coded. If you are testing a custom build, you will
-  need to search and replace `com.android.chrome` in `tools/`.
 * We do not support reftests at the moment.
+* You will need to manually kill Chrome (all channels) before running tests.
 
 Note: rooting the device or installing a root CA is no longer required.
 
-Example:
+Example (assuming you have Chrome Canary installed on your phone):
 
 ```bash
-./wpt run --test-type=testharness chrome_android TESTS
+./wpt run --test-type=testharness --channel=canary chrome_android TESTS
 ```

tools/wpt/browser.py

@@ -597,17 +597,26 @@ def install(self, dest=None, channel=None):
         raise NotImplementedError
 
     def find_binary(self, venv_path=None, channel=None):
-        raise NotImplementedError
+        if channel in ("beta", "dev", "canary"):
+            return "com.chrome." + channel
+        return "com.android.chrome"
 
     def find_webdriver(self, channel=None):
         return find_executable("chromedriver")
 
     def install_webdriver(self, dest=None, channel=None, browser_binary=None):
+        if browser_binary is None:
+            browser_binary = self.find_binary(channel)
         chrome = Chrome(self.logger)
-        return chrome.install_webdriver_by_version(self.version(), dest)
+        return chrome.install_webdriver_by_version(
+            self.version(browser_binary), dest)
 
     def version(self, binary=None, webdriver_binary=None):
-        command = ['adb', 'shell', 'dumpsys', 'package', 'com.android.chrome']
+        if not binary:
+            self.logger.warning("No package name provided.")
+            return None
+
+        command = ['adb', 'shell', 'dumpsys', 'package', binary]
         try:
             output = call(*command)
         except (subprocess.CalledProcessError, OSError):

tools/wpt/run.py

@@ -281,7 +281,7 @@ def setup_kwargs(self, kwargs):
                     logger.info("Downloading chromedriver")
                     webdriver_binary = self.browser.install_webdriver(
                         dest=self.venv.bin_path,
-                        browser_binary=kwargs["binary"]
+                        browser_binary=kwargs["binary"],
                     )
             else:
                 logger.info("Using webdriver binary %s" % webdriver_binary)
@@ -290,8 +290,8 @@ def setup_kwargs(self, kwargs):
                 kwargs["webdriver_binary"] = webdriver_binary
             else:
                 raise WptrunError("Unable to locate or install chromedriver binary")
-        if kwargs["browser_channel"] == "dev":
-            logger.info("Automatically turning on experimental features for Chrome Dev")
+        if browser_channel in ("dev", "canary"):
+            logger.info("Automatically turning on experimental features for Chrome Dev/Canary")
             kwargs["binary_args"].append("--enable-experimental-web-platform-features")
             # HACK(Hexcles): work around https://github.com/web-platform-tests/wpt/issues/16448
             kwargs["webdriver_args"].append("--disable-build-check")
@@ -302,6 +302,10 @@ class ChromeAndroid(BrowserSetup):
     browser_cls = browser.ChromeAndroid
 
     def setup_kwargs(self, kwargs):
+        browser_channel = kwargs["browser_channel"]
+        if kwargs["package_name"] is None:
+            kwargs["package_name"] = self.browser.find_binary(
+                channel=browser_channel)
         if kwargs["webdriver_binary"] is None:
             webdriver_binary = self.browser.find_webdriver()
 
@@ -310,14 +314,22 @@ def setup_kwargs(self, kwargs):
 
                 if install:
                     logger.info("Downloading chromedriver")
-                    webdriver_binary = self.browser.install_webdriver(dest=self.venv.bin_path)
+                    webdriver_binary = self.browser.install_webdriver(
+                        dest=self.venv.bin_path,
+                        browser_binary=kwargs["package_name"],
+                    )
             else:
                 logger.info("Using webdriver binary %s" % webdriver_binary)
 
             if webdriver_binary:
                 kwargs["webdriver_binary"] = webdriver_binary
             else:
                 raise WptrunError("Unable to locate or install chromedriver binary")
+        if browser_channel in ("dev", "canary"):
+            logger.info("Automatically turning on experimental features for Chrome Dev/Canary")
+            kwargs["binary_args"].append("--enable-experimental-web-platform-features")
+            # HACK(Hexcles): work around https://github.com/web-platform-tests/wpt/issues/16448
+            kwargs["webdriver_args"].append("--disable-build-check")
 
 
 class ChromeiOS(BrowserSetup):
@@ -626,8 +638,10 @@ def setup_wptrunner(venv, prompt=True, install_browser=False, **kwargs):
     # Only update browser_version if it was not given as a command line
     # argument, so that it can be overridden on the command line.
     if not kwargs["browser_version"]:
-        kwargs["browser_version"] = setup_cls.browser.version(binary=kwargs.get("binary"),
-                                                              webdriver_binary=kwargs.get("webdriver_binary"))
+        kwargs["browser_version"] = setup_cls.browser.version(
+            binary=kwargs.get("binary") or kwargs.get("package_name"),
+            webdriver_binary=kwargs.get("webdriver_binary"),
+        )
 
     return kwargs
 

tools/wptrunner/wptrunner/browsers/chrome_android.py

@@ -25,11 +25,12 @@
 
 
 def check_args(**kwargs):
+    require_arg(kwargs, "package_name")
     require_arg(kwargs, "webdriver_binary")
 
 
 def browser_kwargs(test_type, run_info_data, config, **kwargs):
-    return {"binary": kwargs["binary"],
+    return {"package_name": kwargs["package_name"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
@@ -45,15 +46,13 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
     executor_kwargs = chrome_executor_kwargs(test_type, server_config,
                                              cache_manager, run_info_data,
                                              **kwargs)
+    # Remove unsupported options on mobile.
     del executor_kwargs["capabilities"]["goog:chromeOptions"]["prefs"]
     del executor_kwargs["capabilities"]["goog:chromeOptions"]["useAutomationExtension"]
 
-    # TODO(Hexcles): browser_channel should be properly supported.
-    package_name = "com.android.chrome"  # stable channel
-    # Required to start on mobile
+    assert kwargs["package_name"], "missing --package-name"
     executor_kwargs["capabilities"]["goog:chromeOptions"]["androidPackage"] = \
-        package_name
-    # Map wptrunner args to chromeOptions.
+        kwargs["package_name"]
 
     return executor_kwargs
 
@@ -71,12 +70,10 @@ class ChromeAndroidBrowser(Browser):
     ``wptrunner.webdriver.ChromeDriverServer``.
     """
 
-    def __init__(self, logger, binary, webdriver_binary="chromedriver",
+    def __init__(self, logger, package_name, webdriver_binary="chromedriver",
                  webdriver_args=None):
-        """Creates a new representation of Chrome.  The `binary` argument gives
-        the browser binary to use for testing."""
         Browser.__init__(self, logger)
-        self.binary = binary
+        self.package_name = package_name
         self.server = ChromeDriverServer(self.logger,
                                          binary=webdriver_binary,
                                          args=webdriver_args)