Chromium Code Reviews| Index: tools/telemetry/telemetry/page/page_runner.py |
| diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py |
| index 4d86f62b4ef7d8b059f13463294634c3641d1848..b7b2ca0189ba029de7ad7f4ebaf307e9ce808e6e 100644 |
| --- a/tools/telemetry/telemetry/page/page_runner.py |
| +++ b/tools/telemetry/telemetry/page/page_runner.py |
| @@ -211,6 +211,11 @@ def _PrepareAndRunPage(test, page_set, expectations, finder_options, |
| tries = 3 |
| while tries: |
| try: |
| + if test.AlwaysRestartBrowserForEachPage(): |
| + # If we are restarting the browser for each page customize the per page |
| + # options just before starting the browser |
|
jeremy
2013/12/17 11:29:44
nit: period
aberent
2013/12/17 17:31:27
Done.
|
| + test.CustomizeBrowserOptionsForPage(page, |
| + possible_browser.finder_options) |
| state.StartBrowser(test, page_set, page, possible_browser, |
| credentials_path, page.archive_path) |
| @@ -237,7 +242,7 @@ def _PrepareAndRunPage(test, page_set, expectations, finder_options, |
| if finder_options.profiler: |
| state.StopProfiling() |
| - if test.NeedsBrowserRestartAfterEachRun(state.browser): |
| + if test.NeedsBrowserRestartBeforeNextPage(state.browser): |
| state.StopBrowser() |
| break |
| @@ -298,8 +303,14 @@ def Run(test, page_set, expectations, finder_options): |
| if page_set.user_agent_type: |
| browser_options.browser_user_agent_type = page_set.user_agent_type |
| - for page in pages: |
| - test.CustomizeBrowserOptionsForPage(page, possible_browser.finder_options) |
| + if not test.AlwaysRestartBrowserForEachPage(): |
| + # If we are restarting the browser for each page then we want to |
| + # customize the browser options for one page at a time. |
| + # If we are only starting the browser once then customize the browser |
| + # options for every page before running any of them. |
| + for page in pages: |
| + test.CustomizeBrowserOptionsForPage(page, |
| + possible_browser.finder_options) |
|
jeremy
2013/12/17 11:29:44
Consider changing this to stick/nonsticky command
aberent
2013/12/17 17:31:27
I don't think we can do quite this. CustomizeBrows
|
| if finder_options.profiler: |
| profiler_class = profiler_finder.FindProfiler(finder_options.profiler) |
| profiler_class.CustomizeBrowserOptions(possible_browser.browser_type, |