commit b058a8f201af2d99f3d02aa956ab118df2d9c67d
author Achuith Bhandarkar <achuith@chromium.org> Thu Jul 02 01:29:05 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Jul 21 01:34:22 2015 +0000
tree a743298f793fb8f7607a1ee52b25d7caa3597e57
parent 6b784d053ddd609a4c3c1bfce11310093c393030

Remove WARs for telemetry.internal imports

BUG=chromium:506037
TEST=autotests

Change-Id: I999bc892e676258b46fc35e3066841a97a95b348
Reviewed-on: https://chromium-review.googlesource.com/283173
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Trybot-Ready: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
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 1fe18d6..5d89d99 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -8,20 +8,8 @@
 from autotest_lib.client.bin import utils
 from telemetry.core import exceptions, util
 from telemetry.core.platform import cros_interface
-
-# TODO(achuith): Clean this up - crbug.com/506037.
-try:
-    from telemetry.core import browser_finder
-except ImportError:
-    from telemetry.internal.browser import browser_finder
-try:
-    from telemetry.core import browser_options
-except ImportError:
-    from telemetry.internal.browser import browser_options
-try:
-    from telemetry.core import extension_to_load
-except ImportError:
-    from telemetry.internal.browser import extension_to_load
+from telemetry.internal.browser import browser_finder, browser_options
+from telemetry.internal.browser import extension_to_load
 
 Error = exceptions.Error