| Index: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
|
| diff --git a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
|
| index b7b5abaf4a6dad4b41446d62b141b37357470314..25901ec9324c6269af991420eb7fb545a2d1e859 100644
|
| --- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
|
| +++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
|
| @@ -133,6 +133,12 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
|
|
|
| return args
|
|
|
| + # TODO(crbug.com/753948): remove this property once webview supports
|
| + # --ignore-certificate-errors-spki-list.
|
| + @property
|
| + def is_webview(self):
|
| + return False
|
| +
|
| def GetReplayBrowserStartupArgs(self):
|
| replay_args = []
|
| network_backend = self.platform_backend.network_controller_backend
|
| @@ -140,7 +146,7 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
|
| return []
|
| proxy_port = network_backend.forwarder.port_pair.remote_port
|
| replay_args.append('--proxy-server=socks://localhost:%s' % proxy_port)
|
| - if not network_backend.is_test_ca_installed:
|
| + if not network_backend.is_test_ca_installed and not self.is_webview:
|
| # Ignore certificate errors for certs that are signed with Wpr's root.
|
| # For more details on this flag, see crbug.com/753948.
|
| wpr_public_hash_file = os.path.join(util.GetCatapultDir(),
|
| @@ -153,6 +159,10 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
|
| wpr_public_hash = f.readline().strip()
|
| replay_args.append('--ignore-certificate-errors-spki-list=' +
|
| wpr_public_hash)
|
| + elif not network_backend.is_test_ca_installed and self.is_webview:
|
| + # --ignore-certificate-errors-spki-list doesn't work with webview yet
|
| + # (crbug.com/753948)
|
| + replay_args.append('--ignore-certificate-errors')
|
| return replay_args
|
|
|
| def HasBrowserFinishedLaunching(self):
|
|
|