[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py

Index: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
diff --git a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
index 515e6f221d9b4421986df3602a98517730c61780..80ed7ad8d9e5b0b4ab91b06883ab712b52ce4cae 100644
--- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
+++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
@@ -7,6 +7,7 @@ import mock
 
 from telemetry.internal import forwarders
 from telemetry.internal.backends.chrome import chrome_browser_backend
+from telemetry.internal.browser import browser_options as browser_options_module
 from telemetry.util import wpr_modes
 
 
@@ -25,18 +26,15 @@ class FakePlatformBackend(object):
     self.network_controller_backend.is_test_ca_installed = False
 
 
-class FakeBrowserOptions(object):
+class FakeBrowserOptions(browser_options_module.BrowserOptions):
   def __init__(self, wpr_mode=wpr_modes.WPR_OFF):
+    super(FakeBrowserOptions, self).__init__()
     self.wpr_mode = wpr_mode
     self.browser_type = 'chrome'
-    self.dont_override_profile = False
     self.browser_user_agent_type = 'desktop'
     self.disable_background_networking = False
     self.disable_component_extensions_with_background_pages = False
     self.disable_default_apps = False
-    self.extra_browser_args = []
-    self.no_proxy_server = False
-    self.enable_logging = False
 
 
 class TestChromeBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
@@ -63,7 +61,7 @@ class StartupArgsTest(unittest.TestCase):
   def testNoProxyServer(self):
     browser_options = FakeBrowserOptions()
     browser_options.no_proxy_server = False
-    browser_options.extra_browser_args = ['--proxy-server=http=inter.net']
+    browser_options.AppendExtraBrowserArgs('--proxy-server=http=inter.net')
     browser_backend = TestChromeBrowserBackend(browser_options)
     self.assertNotIn('--no-proxy-server',
                      browser_backend.GetBrowserStartupArgs())