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

Side by Side Diff: tools/perf/core/perf_benchmark.py

Issue 2381653002: Revert of Remove Extra Underscore (Closed)
Patch Set: Created 4 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 import sys 6 import sys
7 7
8 from telemetry import benchmark 8 from telemetry import benchmark
9 from telemetry.internal.browser import browser_finder 9 from telemetry.internal.browser import browser_finder
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 return target_os 52 return target_os
53 53
54 def _GetVariationsBrowserArgs(self, finder_options): 54 def _GetVariationsBrowserArgs(self, finder_options):
55 variations_dir = os.path.join(os.path.dirname(__file__), '..', 55 variations_dir = os.path.join(os.path.dirname(__file__), '..',
56 '..', '..', 'testing', 'variations') 56 '..', '..', 'testing', 'variations')
57 possible_browser = browser_finder.FindBrowser(finder_options) 57 possible_browser = browser_finder.FindBrowser(finder_options)
58 if not possible_browser: 58 if not possible_browser:
59 return [] 59 return []
60 60
61 return fieldtrial_util.GenerateArgs( 61 return fieldtrial_util.GenerateArgs(
62 os.path.join(variations_dir, 'fieldtrial_testing_config.json'), 62 os.path.join(variations_dir, 'fieldtrial_testing_config_.json'),
63 self._FixupTargetOS(possible_browser.target_os)) 63 self._FixupTargetOS(possible_browser.target_os))
64 64
65 @staticmethod 65 @staticmethod
66 def IsSvelte(possible_browser): 66 def IsSvelte(possible_browser):
67 """Returns whether a possible_browser is on a svelte Android build.""" 67 """Returns whether a possible_browser is on a svelte Android build."""
68 if possible_browser.target_os == 'android': 68 if possible_browser.target_os == 'android':
69 return possible_browser.platform.IsSvelte() 69 return possible_browser.platform.IsSvelte()
70 return False 70 return False
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698