summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-12 17:12:49 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-12 17:12:49 +0000
commit0423beeb2c3b9432de7e676ecd739efa5137e282 (patch)
tree23350d724fde909b1617b27aee69cc679228b9f0 /tools
parent8e1da691f5c68010cd24b6fc468458f248d9b6c8 (diff)
downloadchromium_src-0423beeb2c3b9432de7e676ecd739efa5137e282.zip
chromium_src-0423beeb2c3b9432de7e676ecd739efa5137e282.tar.gz
chromium_src-0423beeb2c3b9432de7e676ecd739efa5137e282.tar.bz2
[telemetry] Don't fail measurements in __init__.
record_wpr tries to __init__ all measurements, so a measurement that isn't supported on a platform should not raise in its __init__. BUG=296172 Review URL: https://codereview.chromium.org/26769002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/measurements/loading_profile.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/measurements/loading_profile.py b/tools/perf/measurements/loading_profile.py
index 3dc96db..ddc145d 100644
--- a/tools/perf/measurements/loading_profile.py
+++ b/tools/perf/measurements/loading_profile.py
@@ -14,9 +14,6 @@ class LoadingProfile(page_measurement.PageMeasurement):
def __init__(self):
super(LoadingProfile, self).__init__(discard_first_result=True)
- if not perf_profiler.PerfProfiler.is_supported(browser_type='any'):
- raise Exception('This measurement is not supported on this platform')
-
@property
def results_are_the_same_on_every_page(self):
return False
@@ -29,6 +26,9 @@ class LoadingProfile(page_measurement.PageMeasurement):
parser.add_option(page_repeat_option)
def CustomizeBrowserOptions(self, options):
+ if not perf_profiler.PerfProfiler.is_supported(browser_type='any'):
+ raise Exception('This measurement is not supported on this platform')
+
perf_profiler.PerfProfiler.CustomizeBrowserOptions(options)
def WillNavigateToPage(self, page, tab):