Index: tools/telemetry/telemetry/page_runner.py |
diff --git a/tools/telemetry/telemetry/page_runner.py b/tools/telemetry/telemetry/page_runner.py |
index b2268e201cf131908a25a8f33e65c0aff0c1f1a8..1d633f66c885acb9bfab86924f3304541fc9749f 100644 |
--- a/tools/telemetry/telemetry/page_runner.py |
+++ b/tools/telemetry/telemetry/page_runner.py |
@@ -35,9 +35,13 @@ class _RunState(object): |
self.tab = None |
if self.browser: |
+ if self.browser.platform.CanMonitorThermalThrottling(): |
nduca
2012/12/07 18:12:06
this check should be somewhere else--- probably af
bulach
2012/12/07 20:45:53
good point, done. raising an exception at the end
|
+ self.browser.platform.StopMonitoringThermalThrottling() |
+ self.browser.platform.SetFullPerformanceModeEnabled(False) |
nduca
2012/12/07 18:12:06
this should be conditional on performance tests be
bulach
2012/12/07 20:45:53
Done.
|
self.browser.Close() |
self.browser = None |
+ |
def _ShufflePageSet(page_set, options): |
if options.test_shuffle_order_file and not options.test_shuffle: |
raise Exception('--test-shuffle-order-file requires --test-shuffle.') |
@@ -117,6 +121,9 @@ http://goto/read-src-internal, or create a new archive using --record. |
if not state.browser: |
self._SetupBrowser(state, test, possible_browser, |
credentials_path, archive_path) |
+ state.browser.platform.SetFullPerformanceModeEnabled(True) |
nduca
2012/12/07 18:12:06
so should this
nduca
2012/12/07 18:12:06
why not inside _SetupBrowser?
bulach
2012/12/07 20:45:53
Done.
|
+ if state.browser.platform.CanMonitorThermalThrottling(): |
+ state.browser.platform.StartMonitoringThermalThrottling() |
if not state.tab: |
state.tab = state.browser.ConnectToNthTab(0) |
if options.trace_dir: |