wpr_mode, no_proxy_server and browser_user_agent_type to BrowserOptions

tools/telemetry/telemetry/core/browser_options.py

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 8fcb2e5761c615def016b4c893d455f6c67eacee..3c647678371820622d8cfaa980a74b9c6eb1b6a6 100644
--- a/tools/telemetry/telemetry/core/browser_options.py
+++ b/tools/telemetry/telemetry/core/browser_options.py
@@ -35,9 +35,6 @@ class BrowserFinderOptions(optparse.Values):
     self.output_profile_path = None
 
     self.cros_remote = None
-    self.wpr_mode = wpr_modes.WPR_OFF
-
-    self.browser_user_agent_type = None
 
     self.profiler = None
     self.verbosity = 0
@@ -45,8 +42,6 @@ class BrowserFinderOptions(optparse.Values):
     self.page_filter = None
     self.page_filter_exclude = None
 
-    self.no_proxy_server = False
-
     self.repeat_options = repeat_options.RepeatOptions()
     self.browser_options = BrowserOptions()
     self.output_file = None
@@ -213,6 +208,10 @@ class BrowserOptions():
     self.profile_type = None
     self._extra_browser_args = set()
     self.extra_wpr_args = []
+    self.wpr_mode = wpr_modes.WPR_OFF
+
+    self.no_proxy_server = False
+    self.browser_user_agent_type = None
 
   def AddCommandLineOptions(self, parser):
     group = optparse.OptionGroup(parser, 'Browser options')