Attempt #5 at converting telemetry to use typ :).

tools/telemetry/telemetry/unittest_util/browser_test_case.py

Index: tools/telemetry/telemetry/unittest_util/browser_test_case.py
diff --git a/tools/telemetry/telemetry/unittest_util/browser_test_case.py b/tools/telemetry/telemetry/unittest_util/browser_test_case.py
index 621c381767591d719b8ff8075cc0e64dcd062c85..bbecefb029e2247eee8e5d63ac728a409cae0cf7 100644
--- a/tools/telemetry/telemetry/unittest_util/browser_test_case.py
+++ b/tools/telemetry/telemetry/unittest_util/browser_test_case.py
@@ -9,28 +9,49 @@ from telemetry.core import browser_finder
 from telemetry.unittest_util import options_for_unittests
 from telemetry.util import path
 
+current_browser_options = None
+current_browser = None
+
+
+def teardown_browser():
+  global current_browser
+  global current_browser_options
+
+  if current_browser:
+    current_browser.Close()
+  current_browser = None
+  current_browser_options = None
+
 
 class BrowserTestCase(unittest.TestCase):
   @classmethod
   def setUpClass(cls):
+    global current_browser
+    global current_browser_options
+
     options = options_for_unittests.GetCopy()
+
     cls.CustomizeBrowserOptions(options.browser_options)
-    browser_to_create = browser_finder.FindBrowser(options)
-    if not browser_to_create:
-      raise Exception('No browser found, cannot continue test.')
+    if not current_browser or (current_browser_options !=
+                               options.browser_options):
+      if current_browser:
+        teardown_browser()
 
-    cls._browser = None
-    try:
-      cls._browser = browser_to_create.Create(options)
-    except:
-      cls.tearDownClass()
-      raise
+      browser_to_create = browser_finder.FindBrowser(options)
+      if not browser_to_create:
+        raise Exception('No browser found, cannot continue test.')
+
+      try:
+        current_browser = browser_to_create.Create(options)
+        current_browser_options = options.browser_options
+      except:
+        cls.tearDownClass()
+        raise
+    cls._browser = current_browser
 
   @classmethod
   def tearDownClass(cls):
-    if cls._browser:
-      cls._browser.Close()
-      cls._browser = None
+    pass
 
   @classmethod
   def CustomizeBrowserOptions(cls, options):