Do not close network controller in ProfileExtender if it was not opened there.

tools/perf/profile_creators/profile_extender.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 
 from telemetry.core import platform
 from telemetry.util import wpr_modes
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import browser_finder_exceptions
@@ skipping 20 matching lines @@
     self._finder_options = copy.deepcopy(finder_options)
     # Since profile extenders are not supported on remote platforms,
     # this should be the same as target platform.
     self._os_name = platform.GetHostPlatform().GetOSName()
 
     # A reference to the browser that will be performing all of the tab
     # navigations.
     # This member is initialized during SetUpBrowser().
     self._browser = None
 
+    # We only need to close network controller if we opened it before.
+    # If it was already open, we should not close it.
+    self._should_close_network_controller = False
+
   def Run(self):
     """Creates or extends the profile."""
     raise NotImplementedError()
 
   def WebPageReplayArchivePath(self):
     """Returns the path to the WPR archive.
 
     Can be overridden by subclasses.
     """
     return None
@@ skipping 51 matching lines @@
     self._SetUpWebPageReplay(self.finder_options, possible_browser)
     self._browser = possible_browser.Create(self.finder_options)
 
   def TearDownBrowser(self):
     """Tears down the browser.
 
     Can be overridden by subclasses. The subclass implementation must call the
     super class implementation.
     """
     if self._browser:
-      self._browser.platform.network_controller.Close()
+      if self._should_close_network_controller:
+        self._browser.platform.network_controller.Close()
       self._browser.Close()
       self._browser = None
 
   def FetchWebPageReplayArchives(self):
     """Fetches the web page replay archives.
 
     Can be overridden by subclasses.
     """
     pass
 
   def _SetUpWebPageReplay(self, finder_options, possible_browser):
     """Sets up Web Page Replay, if necessary."""
 
     wpr_archive_path = self.WebPageReplayArchivePath()
     if not wpr_archive_path:
       return
 
     self.FetchWebPageReplayArchives()
 
     if finder_options.use_live_sites:
       wpr_mode = wpr_modes.WPR_OFF
     else:
       wpr_mode = wpr_modes.WPR_REPLAY
 
     network_controller = possible_browser.platform.network_controller
-    network_controller.Open(wpr_mode, finder_options.browser_options.netsim,
-                            finder_options.browser_options.extra_wpr_args)
+    if not network_controller.is_open:
+      self._should_close_network_controller = True
+      network_controller.Open(wpr_mode, finder_options.browser_options.netsim,
+                              finder_options.browser_options.extra_wpr_args)
     network_controller.StartReplay(
         wpr_archive_path, make_javascript_deterministic=True)
 
   def _GetPossibleBrowser(self, finder_options):
     """Return a possible_browser with the given options."""
     possible_browser = browser_finder.FindBrowser(finder_options)
     if not possible_browser:
       raise browser_finder_exceptions.BrowserFinderException(
           'No browser found.\n\nAvailable browsers:\n%s\n' %
           '\n'.join(browser_finder.GetAllAvailableBrowserTypes(finder_options)))
     finder_options.browser_options.browser_type = (
         possible_browser.browser_type)
 
     return possible_browser