tools/telemetry/telemetry/core/chrome/browser_backend.py - Issue 12278015: [Telemetry] Reorganize everything.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/chrome/browser_backend.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

« no previous file with comments | « tools/telemetry/telemetry/core/chrome/android_platform.py ('k') | tools/telemetry/telemetry/core/chrome/chromeos_login_ext/main.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/chrome/browser_backend.py

diff --git a/tools/telemetry/telemetry/browser_backend.py b/tools/telemetry/telemetry/core/chrome/browser_backend.py

similarity index 93%

rename from tools/telemetry/telemetry/browser_backend.py

rename to tools/telemetry/telemetry/core/chrome/browser_backend.py

index 374c867e78be75e3f436c018e03920667b791c4c..dadc0febfe7b90546214a3a1e2e8f0beb254dfa0 100644

--- a/tools/telemetry/telemetry/browser_backend.py

+++ b/tools/telemetry/telemetry/core/chrome/browser_backend.py

@@ -9,15 +9,15 @@ import json

import re

import sys

-from telemetry import browser_gone_exception

-from telemetry import extension_dict_backend

-from telemetry import options_for_unittests

-from telemetry import tab_list_backend

-from telemetry import tracing_backend

-from telemetry import user_agent

-from telemetry import util

-from telemetry import wpr_modes

-from telemetry import wpr_server

+from telemetry.core import util

+from telemetry.core import exceptions

+from telemetry.core import user_agent

+from telemetry.core import wpr_modes

+from telemetry.core import wpr_server

+from telemetry.core.chrome import extension_dict_backend

+from telemetry.core.chrome import tab_list_backend

+from telemetry.core.chrome import tracing_backend

+from telemetry.test import options_for_unittests

class ExtensionsNotSupportedException(Exception):

pass

@@ -114,7 +114,7 @@ class BrowserBackend(object):

try:

util.WaitFor(IsBrowserUp, timeout=30)

except util.TimeoutException:

- raise browser_gone_exception.BrowserGoneException()

+ raise exceptions.BrowserGoneException()

def AllExtensionsLoaded():

for e in self.options.extensions_to_load: