[Telemetry] Reorganize everything.

tools/telemetry/telemetry/core/chrome/desktop_browser_finder.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.
 """Finds desktop browsers that can be controlled by telemetry."""
 
 import logging
 import os
 import subprocess
 import sys
 
-from telemetry import browser
-from telemetry import desktop_browser_backend
-from telemetry import platform
-from telemetry import possible_browser
+from telemetry.core import browser
+from telemetry.core import possible_browser
+from telemetry.core.chrome import desktop_browser_backend
+from telemetry.core.chrome import platform
 
 ALL_BROWSER_TYPES = ','.join([
     'exact',
     'release',
     'debug',
     'canary',
     'content-shell-debug',
     'content-shell-release',
     'system'])
 
@@ skipping 36 matching lines @@
       browsers.append(PossibleDesktopBrowser('exact', options,
                                              normalized_executable, False))
     else:
       logging.warning('%s specified by browser_executable does not exist',
                       normalized_executable)
 
   # Look for a browser in the standard chrome build locations.
   if options.chrome_root:
     chrome_root = options.chrome_root
   else:
-    chrome_root = os.path.join(os.path.dirname(__file__), '..', '..', '..')
+    chrome_root = os.path.join(os.path.dirname(__file__),
+                               '..', '..', '..', '..', '..')
 
   if sys.platform == 'darwin':
     chromium_app_name = 'Chromium.app/Contents/MacOS/Chromium'
     content_shell_app_name = 'Content Shell.app/Contents/MacOS/Content Shell'
   elif sys.platform.startswith('linux'):
     chromium_app_name = 'chrome'
     content_shell_app_name = 'content_shell'
   elif sys.platform.startswith('win'):
     chromium_app_name = 'chrome.exe'
     content_shell_app_name = 'content_shell.exe'
@@ skipping 70 matching lines @@
                     chromium_app_name, False):
         break
 
   if len(browsers) and not has_display:
     logging.warning(
       'Found (%s), but you do not have a DISPLAY environment set.' %
       ','.join([b.browser_type for b in browsers]))
     return []
 
   return browsers