Chromium Code Reviews| Index: tools/telemetry/telemetry/core/browser_options.py |
| diff --git a/tools/telemetry/telemetry/core/browser_options.py b/tools/telemetry/telemetry/core/browser_options.py |
| index a7f0b4ad074338453d91c738269e543602e44bfe..f350f624f934de985bb4139fe849c1e67dbeee8b 100644 |
| --- a/tools/telemetry/telemetry/core/browser_options.py |
| +++ b/tools/telemetry/telemetry/core/browser_options.py |
| @@ -23,6 +23,9 @@ class BrowserOptions(optparse.Values): |
| self.android_device = None |
| self.cros_ssh_identity = None |
|
nduca
2013/04/26 20:09:36
what happens when this patch and you try --profile
jeremy
2013/05/01 11:52:00
I've added code to explicitly thrown an exception
|
| + # When set to True, the browser will use whatever profile location it's |
| + # configured to use by default. Telemetry will not request the browser use |
| + # an alternate profile directory. |
| self.dont_override_profile = False |
| self.profile_dir = None |
| self.extra_browser_args = [] |
| @@ -84,7 +87,7 @@ class BrowserOptions(optparse.Values): |
| # Browser options |
| group = optparse.OptionGroup(parser, 'Browser options') |
| - profile_choices = ['clean', 'default'] + profile_types.PROFILE_TYPES |
| + profile_choices = profile_types.PROFILE_TYPES |
| group.add_option('--profile-type', |
| dest='profile_type', |
| type='choice', |
| @@ -191,9 +194,7 @@ class BrowserOptions(optparse.Values): |
| delattr(self, 'extra_wpr_args_as_string') |
| if self.profile_type == 'default': |
| self.dont_override_profile = True |
| - elif self.profile_type != 'clean': |
| - self.profile_dir = profile_types.GetProfileDir(self.profile_type) |
| - delattr(self, 'profile_type') |
| + self.profile_dir = profile_types.GetProfileDir(self.profile_type) |
|
nduca
2013/04/26 20:09:36
i'd like to not allow profile_dir to be set by use
|
| return ret |
| parser.parse_args = ParseArgs |
| return parser |