commit 704134ddfa2e1d67afbfabc7afcc24f849ac0e36
author Achuith Bhandarkar <achuith@chromium.org> Thu Mar 05 17:31:57 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sat Mar 07 06:18:17 2015 +0000
tree 7cccd2cfbe49f40300230b225222c38af4e4c79e
parent d346fc992ad4d4d909b69c82242a082d96fda0d3

Use telemetry.core.exceptions.Error everywhere.

BUG=chromium:460625
TEST=bots

Change-Id: I819b78ea402ee8bd8c669ec471c840106f35e548
Reviewed-on: https://chromium-review.googlesource.com/256740
Trybot-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>
Commit-Queue: 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 86ee4ee..cfcb9db 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -6,7 +6,9 @@
 
 from telemetry.core import browser_finder, browser_options, exceptions
 from telemetry.core import extension_to_load, util
-from telemetry.core.backends.chrome_inspector import devtools_http
+
+
+Error = exceptions.Error
 
 
 class Chrome(object):
@@ -164,8 +166,7 @@
         """
         try:
             func()
-        except (exceptions.AppCrashException,
-                devtools_http.DevToolsClientConnectionError):
+        except (Error):
             return True
         return False
 

client/cros/multimedia/display_facade_native.py

diff --git a/client/cros/multimedia/display_facade_native.py b/client/cros/multimedia/display_facade_native.py
index 03ae1ef..ad204c3 100644
--- a/client/cros/multimedia/display_facade_native.py
+++ b/client/cros/multimedia/display_facade_native.py
@@ -10,11 +10,10 @@
 import os
 import re
 import time
-import telemetry
 
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros import retry
+from autotest_lib.client.common_lib.cros import chrome, retry
 from autotest_lib.client.cros import constants, sys_power
 from autotest_lib.client.cros.graphics import graphics_utils
 from autotest_lib.client.cros.multimedia import image_generator
@@ -27,12 +26,8 @@
 _FLAKY_CHROME_CALL_RETRY_DELAY_SEC = 1
 _FLAKY_DISPLAY_CALL_RETRY_DELAY_SEC = 2
 
-_telemetry_devtools = telemetry.core.backends.chrome_inspector.devtools_http
 _retry_chrome_call = retry.retry(
-        (telemetry.core.exceptions.BrowserConnectionGoneException,
-         telemetry.core.exceptions.DevtoolsTargetCrashException,
-         _telemetry_devtools.DevToolsClientUrlError,
-         exceptions.IndexError),
+        (chrome.Error, exceptions.IndexError),
         timeout_min=_FLAKY_CALL_RETRY_TIMEOUT_SEC / 60.0,
         delay_sec=_FLAKY_CHROME_CALL_RETRY_DELAY_SEC)