Index: tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
diff --git a/tools/telemetry/telemetry/android_browser_backend.py b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
similarity index 95% |
rename from tools/telemetry/telemetry/android_browser_backend.py |
rename to tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
index 290e71dd13c97a989a60efa727fd921df9688a25..ee033e78e2cbbe8bb67c26fa35b2bb5744f3685b 100644 |
--- a/tools/telemetry/telemetry/android_browser_backend.py |
+++ b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
@@ -1,7 +1,6 @@ |
# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
- |
import json |
import logging |
import os |
@@ -10,9 +9,9 @@ import sys |
import tempfile |
import time |
-from telemetry import adb_commands |
-from telemetry import browser_backend |
-from telemetry import browser_gone_exception |
+from telemetry.core import exceptions |
+from telemetry.core.chrome import adb_commands |
+from telemetry.core.chrome import browser_backend |
class AndroidBrowserBackend(browser_backend.BrowserBackend): |
"""The backend for controlling a browser instance running on Android. |
@@ -98,8 +97,7 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend): |
logging.critical('android_browser_backend: Could not find ' |
'preferences file %s for %s', |
prefs_file, self._package) |
- raise browser_gone_exception.BrowserGoneException( |
- 'Missing preferences file.') |
+ raise exceptions.BrowserGoneException('Missing preferences file.') |
self._adb.CloseApplication(self._package) |
preferences = json.loads(''.join( |
@@ -127,7 +125,7 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend): |
try: |
self._WaitForBrowserToComeUp() |
self._PostBrowserStartupInitialization() |
- except browser_gone_exception.BrowserGoneException: |
+ except exceptions.BrowserGoneException: |
logging.critical('Failed to connect to browser.') |
if not self._adb.IsRootEnabled(): |
logging.critical( |