Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py

Issue 12278015: [Telemetry] Reorganize everything. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add shebangs. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py
diff --git a/tools/telemetry/telemetry/desktop_browser_finder.py b/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py
similarity index 94%
rename from tools/telemetry/telemetry/desktop_browser_finder.py
rename to tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py
index 2f2243df8f4689d23cb0a2a006f27524d0792b1a..16ffe2779166456f63400576153204016d418651 100644
--- a/tools/telemetry/telemetry/desktop_browser_finder.py
+++ b/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py
@@ -8,10 +8,10 @@ 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',
@@ -68,7 +68,8 @@ def FindAllAvailableBrowsers(options):
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'

Powered by Google App Engine
This is Rietveld 408576698