telemetry: Transition import path for cros_interface.
crbug.com/462776 changed the import path for cros_interface. To allow
this change to make it through the CrOS PFQ, we must support both the
old and the new paths. We'll later send in a change to drop the old
path.
BUG=chromium:512427
TEST=CQ passes, PFQ passes.
Change-Id: I34fadbc9f8adf86437050bc2c10be297e3237eee
Reviewed-on: https://chromium-review.googlesource.com/287163
Trybot-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 5d89d99..a688f2d 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -7,7 +7,12 @@
from autotest_lib.client.cros import constants
from autotest_lib.client.bin import utils
from telemetry.core import exceptions, util
-from telemetry.core.platform import cros_interface
+# Need to support both paths for the transition (crbug.com/512427).
+try:
+ from telemetry.core.platform import cros_interface
+except ImportError:
+ from telemetry.core import cros_interface
+
from telemetry.internal.browser import browser_finder, browser_options
from telemetry.internal.browser import extension_to_load