commit 1cc4157bbb604707ab9880ce7caca5682c554775
author Achuith Bhandarkar <achuith@chromium.org> Fri Sep 30 09:47:46 2016 -0700
committer Achuith Bhandarkar <achuith@chromium.org> Mon Oct 03 23:23:37 2016 +0000
tree 8249edbf2e10f73b5f6cf8fbccb811c7ce70b807
parent abd3b05597bfa2e5244209b7f5146900a58290a9

Don't initialize network controller for gaia login.

BUG=chromium:650936
TEST=login_GaiaLogin

Change-Id: I1b183a80fdee3ec6032af96e95df0401c183a622
Reviewed-on: https://chromium-review.googlesource.com/391123
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Ned Nguyen <nednguyen@google.com>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>

client/common_lib/cros/chrome.py

diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index cc6401b..b0e283a 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -162,15 +162,14 @@
         # (Without this, Chrome coredumps are trashed.)
         open(constants.CHROME_CORE_MAGIC_FILE, 'w').close()
 
+        self._network_controller = None
         for i in range(num_tries):
             try:
                 browser_to_create = browser_finder.FindBrowser(finder_options)
-                self.network_controller = \
-                    browser_to_create.platform.network_controller
-                # TODO(achuith): Remove if condition after catapult:#2584 has
-                # landed and PFQ has rolled. crbug.com/639730.
-                if hasattr(self.network_controller, 'InitializeIfNeeded'):
-                    self.network_controller.InitializeIfNeeded()
+                if not gaia_login:
+                    self._network_controller = \
+                        browser_to_create.platform.network_controller
+                    self._network_controller.InitializeIfNeeded()
                 self._browser = browser_to_create.Create(finder_options)
                 if is_arc_available():
                     if not disable_arc_opt_in:
@@ -301,14 +300,15 @@
 
 
     def close(self):
+        """Closes the browser.
+        """
         try:
-            if hasattr(self.network_controller, 'Close'):
-                self.network_controller.Close()
-                logging.info('Network controller is closed')
+            if self._network_controller:
+                self._network_controller.Close()
+                logging.debug('Network controller is closed')
         except Error as e:
             logging.error('Failed to close network controller, error=%s', e)
 
-        """Closes the browser."""
         try:
             if is_arc_available():
                 arc_util.pre_processing_before_close(self)