| Index: tools/variations/fieldtrial_util.py
|
| diff --git a/tools/variations/fieldtrial_util.py b/tools/variations/fieldtrial_util.py
|
| index 4f2521538b79c8bb171bdc587256f832de8ce632..e76d4cdabcdc935364db12b49a938b20a12c72f4 100644
|
| --- a/tools/variations/fieldtrial_util.py
|
| +++ b/tools/variations/fieldtrial_util.py
|
| @@ -22,17 +22,10 @@ def _escape(str):
|
|
|
| # Generate a list of command-line switches to enable field trials defined in
|
| # fieldtrial_testing_config_*.json.
|
| -def GenerateArgs(base_config_path, platform_config_path=None):
|
| +def GenerateArgs(config_path):
|
| try:
|
| - with open(base_config_path, 'r') as base_file:
|
| + with open(config_path, 'r') as base_file:
|
| variations = json.load(base_file)
|
| - if platform_config_path:
|
| - try:
|
| - with open(platform_config_path, 'r') as platform_file:
|
| - platform_specifics = json.load(platform_file)
|
| - variations.update(platform_specifics)
|
| - except (IOError, ValueError):
|
| - pass
|
| except (IOError, ValueError):
|
| return []
|
|
|
|
|