Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

Issue 3009313002: Revert of [Telemetry] Use --ignore-certificate-errors-spki-list to bypass cert errors (Closed)
Patch Set: Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cf1889d429590e829f56d7ba3526032728c87e55..908239d798e35054745a91fcab9a802e15298df9 100644
--- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
+++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import logging
-import os
import pprint
import shlex
import sys
@@ -129,18 +128,9 @@
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:
- # 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(),
- 'web_page_replay_go',
- 'wpr_public_hash.txt')
- if not os.path.exists(wpr_public_hash_file):
- raise exceptions.PathMissingError('Unable to find %s' %
- wpr_public_hash_file)
- with open(wpr_public_hash_file) as f:
- wpr_public_hash = f.readline().strip()
- replay_args.append('--ignore-certificate-errors-spki-list=' +
- wpr_public_hash)
+ # Ignore certificate errors if the platform backend has not created
+ # and installed a root certificate.
+ replay_args.append('--ignore-certificate-errors')
return replay_args
def HasBrowserFinishedLaunching(self):
« no previous file with comments | « no previous file | telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698