Chromium Code Reviews| 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 338cc299c2810e27fbb170f10ce635965862b5cf..bea4cbbe2abe2e6f40f1afb579526e22e4cf24ab 100644 |
| --- a/tools/chrome_remote_control/chrome_remote_control/page_runner.py |
| +++ b/tools/chrome_remote_control/chrome_remote_control/page_runner.py |
| @@ -34,7 +34,14 @@ class PageRunner(object): |
| possible_browser.options.wpr_mode = wpr_modes.WPR_REPLAY |
| else: |
| possible_browser.options.wpr_mode = wpr_modes.WPR_OFF |
| - logging.warning(""" |
| + def _ContainsOnlyFileURLs(page_set): |
|
dtu
2012/11/05 19:48:53
Put into class PageSet.
tonyg
2012/11/05 23:02:01
Done.
|
| + for page in page_set: |
| + parsed_url = urlparse.urlparse(page.url) |
| + if parsed_url.scheme != 'file': |
| + return False |
| + return True |
| + if not _ContainsOnlyFileURLs(self.page_set): |
| + logging.warning(""" |
| The page set archive %s does not exist, benchmarking against live sites! |
| Results won't be repeatable or comparable. |
| @@ -108,7 +115,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) |