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

Unified Diff: tools/chrome_remote_control/chrome_remote_control/page_runner.py

Issue 11314012: Add spaceport benchmark to Chrome Remote Control. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bug Created 8 years, 1 month 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
Index: tools/chrome_remote_control/chrome_remote_control/page_runner.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_runner.py b/tools/chrome_remote_control/chrome_remote_control/page_runner.py
index 48de8cf3a2b709be534da750fbca20fe895b6989..1295311e07cdd4abf5803491de5ec19237af462f 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_runner.py
+++ b/tools/chrome_remote_control/chrome_remote_control/page_runner.py
@@ -57,7 +57,8 @@ class PageRunner(object):
possible_browser.options.wpr_mode = wpr_modes.WPR_REPLAY
else:
possible_browser.options.wpr_mode = wpr_modes.WPR_OFF
- logging.warning("""
+ if not self.page_set.ContainsOnlyFileURLs():
+ logging.warning("""
The page set archive %s does not exist, benchmarking against live sites!
Results won't be repeatable or comparable.
@@ -147,7 +148,8 @@ http://goto/read-src-internal, or create a new archive using --record.
parsed_url = urlparse.urlparse(page.url)
if parsed_url[0] == 'file':
path = os.path.join(self.page_set.base_dir,
- parsed_url.netloc) # pylint: disable=E1101
+ parsed_url.netloc,
+ parsed_url.path) # pylint: disable=E1101
dirname, filename = os.path.split(path)
tab.browser.SetHTTPServerDirectory(dirname)
target_side_url = tab.browser.http_server.UrlOf(filename)
@@ -178,5 +180,5 @@ http://goto/read-src-internal, or create a new archive using --record.
def CleanUpPage(self, page, tab, page_state): # pylint: disable=R0201
if page.credentials and page_state.did_login:
tab.browser.credentials.LoginNoLongerNeeded(tab, page.credentials)
- tab.runtime.Evaluate("""chrome && chrome.benchmarking &&
+ tab.runtime.Evaluate("""window.chrome && chrome.benchmarking &&
chrome.benchmarking.closeConnections()""")

Powered by Google App Engine
This is Rietveld 408576698