Move more options to browser options.

tools/telemetry/telemetry/core/browser_options_unittest.py

Index: tools/telemetry/telemetry/core/browser_options_unittest.py
diff --git a/tools/telemetry/telemetry/core/browser_options_unittest.py b/tools/telemetry/telemetry/core/browser_options_unittest.py
index c06a48071b33cc5162a3ac1886d5dafe7d11d228..eb0b3627711110a9eae1f2ed0d3298a93cf4ead0 100644
--- a/tools/telemetry/telemetry/core/browser_options_unittest.py
+++ b/tools/telemetry/telemetry/core/browser_options_unittest.py
@@ -64,13 +64,13 @@ class BrowserOptionsTest(unittest.TestCase):
     options = browser_options.BrowserFinderOptions()
     parser = options.CreateParser()
     parser.parse_args(['--browser', 'any'])
-    self.assertEquals(options.profile_dir, None)
+    self.assertEquals(options.browser_options.profile_dir, None)
 
   def testProfileDir(self):
     options = browser_options.BrowserFinderOptions()
     parser = options.CreateParser()
     parser.parse_args(['--browser', 'any', '--profile-dir', 'foo'])
-    self.assertEquals(options.profile_dir, 'foo')
+    self.assertEquals(options.browser_options.profile_dir, 'foo')
 
   def testMergeDefaultValues(self):
     options = browser_options.BrowserFinderOptions()