Reland of "[telemetry] Wire TsProxy through telemetry's network stack."

telemetry/telemetry/internal/browser/browser_unittest.py

Index: telemetry/telemetry/internal/browser/browser_unittest.py
diff --git a/telemetry/telemetry/internal/browser/browser_unittest.py b/telemetry/telemetry/internal/browser/browser_unittest.py
index 923d48257afdbff116cb999093eae55df68a8ffb..af46a8e59c58fb99f832ea78b444c9f53022945b 100644
--- a/telemetry/telemetry/internal/browser/browser_unittest.py
+++ b/telemetry/telemetry/internal/browser/browser_unittest.py
@@ -183,21 +183,17 @@
   options = options_for_unittests.GetCopy()
   options.browser_options.output_profile_path = profile_dir
   browser_to_create = browser_finder.FindBrowser(options)
-  browser_to_create.platform.network_controller.InitializeIfNeeded()
-  try:
-    with browser_to_create.Create(options) as browser:
-      browser.platform.SetHTTPServerDirectories(path.GetUnittestDataDir())
-      blank_file_path = os.path.join(path.GetUnittestDataDir(), 'blank.html')
-      blank_url = browser.platform.http_server.UrlOf(blank_file_path)
-      browser.foreground_tab.Navigate(blank_url)
-      browser.foreground_tab.WaitForDocumentReadyStateToBeComplete()
-      for _ in xrange(number_of_tabs - 1):
-        tab = browser.tabs.New()
-        tab.Navigate(blank_url)
-        tab.WaitForDocumentReadyStateToBeComplete()
-    return profile_dir
-  finally:
-    browser_to_create.platform.network_controller.Close()
+  with browser_to_create.Create(options) as browser:
+    browser.platform.SetHTTPServerDirectories(path.GetUnittestDataDir())
+    blank_file_path = os.path.join(path.GetUnittestDataDir(), 'blank.html')
+    blank_url = browser.platform.http_server.UrlOf(blank_file_path)
+    browser.foreground_tab.Navigate(blank_url)
+    browser.foreground_tab.WaitForDocumentReadyStateToBeComplete()
+    for _ in xrange(number_of_tabs - 1):
+      tab = browser.tabs.New()
+      tab.Navigate(blank_url)
+      tab.WaitForDocumentReadyStateToBeComplete()
+  return profile_dir
 
 
 class BrowserCreationTest(unittest.TestCase):
@@ -237,7 +233,6 @@
         ['--restore-last-session'])
     cls._options.browser_options.profile_dir = cls._profile_dir
     cls._browser_to_create = browser_finder.FindBrowser(cls._options)
-    cls._browser_to_create.platform.network_controller.InitializeIfNeeded()
 
   @decorators.Enabled('has tabs')
   @decorators.Disabled('chromeos', 'win', 'mac')
@@ -256,7 +251,6 @@
 
   @classmethod
   def tearDownClass(cls):
-    cls._browser_to_create.platform.network_controller.Close()
     shutil.rmtree(cls._profile_dir)
 
 
@@ -269,14 +263,10 @@
     browser_to_create = browser_finder.FindBrowser(options)
     self.assertIsNotNone(browser_to_create)
     before_browser_run_temp_dir_content = os.listdir(tempfile.tempdir)
-    browser_to_create.platform.network_controller.InitializeIfNeeded()
-    try:
-      with browser_to_create.Create(options) as browser:
-        tab = browser.tabs.New()
-        tab.Navigate('about:blank')
-        self.assertEquals(2, tab.EvaluateJavaScript('1 + 1'))
-      after_browser_run_temp_dir_content = os.listdir(tempfile.tempdir)
-      self.assertEqual(before_browser_run_temp_dir_content,
-                       after_browser_run_temp_dir_content)
-    finally:
-      browser_to_create.platform.network_controller.Close()
+    with browser_to_create.Create(options) as browser:
+      tab = browser.tabs.New()
+      tab.Navigate('about:blank')
+      self.assertEquals(2, tab.EvaluateJavaScript('1 + 1'))
+    after_browser_run_temp_dir_content = os.listdir(tempfile.tempdir)
+    self.assertEqual(before_browser_run_temp_dir_content,
+                     after_browser_run_temp_dir_content)