commit 08edc2030ea4fe745002cfce4ab7f73468245bf0
author Achuith Bhandarkar <achuith@chromium.org> Tue Aug 23 14:21:55 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu Aug 25 01:46:49 2016 -0700
tree 4fdab78a57ef2c63d2062948fdd5eecc31cabdc7
parent 8824661015eddc15ee8885a43789597dfc8d93b9

NetworkController needs explicit initialization.

This is in anticipation of catapult:#2584.

BUG=chromium:639730
TEST=vm tests.

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

client/common_lib/cros/chrome.py

diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 895e6e1..d5ed0b0 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -165,6 +165,12 @@
         for i in range(num_tries):
             try:
                 browser_to_create = browser_finder.FindBrowser(finder_options)
+                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(network_controller, 'InitializeIfNeeded'):
+                    network_controller.InitializeIfNeeded()
                 self._browser = browser_to_create.Create(finder_options)
                 if is_arc_available():
                     if not disable_arc_opt_in: