[Telemetry] Reorganize everything.

tools/telemetry/telemetry/core/chrome/android_browser_backend.py

 # 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
 import subprocess
 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.
   """
   def __init__(self, options, adb, package, is_content_shell,
                cmdline_file, activity, devtools_remote_port):
     super(AndroidBrowserBackend, self).__init__(
         is_content_shell=is_content_shell,
         supports_extensions=False, options=options)
     if len(options.extensions_to_load) > 0:
@@ skipping 65 matching lines @@
         timeout = 3
         time.sleep(timeout)
         while not self._adb.Adb().GetProtectedFileContents(prefs_file):
           time.sleep(timeout)
           retries += 1
           timeout *= 2
           if retries == 3:
             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(
           self._adb.Adb().GetProtectedFileContents(prefs_file)))
       changed = False
       if 'devtools' not in preferences:
         preferences['devtools'] = {}
         changed = True
       if not preferences['devtools'].get('remote_enabled'):
         preferences['devtools']['remote_enabled'] = True
         changed = True
       if changed:
         logging.warning('Manually enabled devtools protocol on %s' %
                         self._package)
         txt = json.dumps(preferences, indent=2)
         self._adb.Adb().SetProtectedFileContents(prefs_file, txt)
 
     # Start it up with a fresh log.
     self._adb.RunShellCommand('logcat -c')
     self._adb.StartActivity(self._package,
                             self._activity,
                             True,
                             None,
                             'chrome://newtab/')
     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(
           'Ensure web debugging is enabled in Chrome at '
           '"Settings > Developer tools > Enable USB Web debugging".')
       sys.exit(1)
     except:
       import traceback
       traceback.print_exc()
       self.Close()
@@ skipping 40 matching lines @@
               '-dump', f.name], stdout=subprocess.PIPE).communicate()[0]
         except Exception:
           pass
         if symbolized_stack:
           return symbolized_stack
     # Otherwise, just return the last 100 lines of logcat.
     return '\n'.join(self._adb.RunShellCommand('logcat -d -t 100'))
 
   def CreateForwarder(self, *port_pairs):
     return adb_commands.Forwarder(self._adb, *port_pairs)