[tools/perf] Switch perf.fyi webview bots to webview-google

Using --browser=android-webview-google should make these bots install
Monochrome.apk and use it as webview provider.

Bug: 817842
Change-Id: I6cc9f685cb06467ae31b34c5627ce2b8b9bceedc
Reviewed-on: https://chromium-review.googlesource.com/c/1344429Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Juan Antonio Navarro Pérez <perezju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610046}

testing/buildbot/chromium.perf.fyi.json

@@ -88,7 +88,7 @@
       {
         "args": [
           "-v",
-          "--browser=android-webview",
+          "--browser=android-webview-google",
           "--upload-results",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
           "--test-shard-map-filename=android-go_webview-perf_map.json"
@@ -225,7 +225,7 @@
       {
         "args": [
           "-v",
-          "--browser=android-webview",
+          "--browser=android-webview-google",
           "--upload-results",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
           "--test-shard-map-filename=android-pixel2_webview-perf_map.json"

tools/perf/core/perf_data_generator.py

@@ -81,7 +81,7 @@ NEW_PERF_RECIPE_FYI_TESTERS = {
           'num_shards': 7
         }
       ],
-      'platform': 'android-webview',
+      'platform': 'android-webview-google',
       'dimension': {
         'pool': 'chrome.tests.perf-webview-fyi',
         'os': 'Android',
@@ -120,7 +120,7 @@ NEW_PERF_RECIPE_FYI_TESTERS = {
           'num_shards': 25
         }
       ],
-      'platform': 'android-webview',
+      'platform': 'android-webview-google',
       'dimension': {
         'pool': 'chrome.tests.perf-webview',
         'os': 'Android',
@@ -904,10 +904,8 @@ def generate_telemetry_args(tester_config):
     browser_name = 'reference'
   elif tester_config['platform'] == 'android':
     browser_name = 'android-chromium'
-  elif tester_config['platform'] == 'android-chrome':
-    browser_name = 'android-chrome'
-  elif tester_config['platform'] == 'android-webview':
-    browser_name = 'android-webview'
+  elif tester_config['platform'].startswith('android-'):
+    browser_name = tester_config['platform']
   elif (tester_config['platform'] == 'win'
     and tester_config['target_bits'] == 64):
     browser_name = 'release_x64'
@@ -920,7 +918,7 @@ def generate_telemetry_args(tester_config):
     '--upload-results'
   ]
 
-  if browser_name == 'android-webview':
+  if browser_name.startswith('android-webview'):
     test_args.append(
         '--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk')
 

tools/perf/core/perf_json_config_validator.py

@@ -80,9 +80,11 @@ def _ValidateShardingData(builder_name, test_config):
 def _ValidateBrowserType(builder_name, test_config):
   browser_options = _ParseBrowserFlags(test_config['args'])
   if 'WebView' in builder_name or 'webview' in builder_name:
-    if browser_options.browser != 'android-webview':
-      raise ValueError("%s must use 'android-webview' browser type" %
-                       builder_name)
+    if browser_options.browser not in (
+        'android-webview', 'android-webview-google'):
+      raise ValueError(
+          "%s must use 'android-webview' or 'android-webview-google' browser" %
+          builder_name)
     if not browser_options.webview_embedder_apk:
       raise ValueError('%s must set --webview-embedder-apk flag' % builder_name)
   elif 'Android' in builder_name or 'android' in builder_name: