summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 22:14:02 +0000
committerachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 22:14:02 +0000
commitab73919a44d827bbf685873ae283fc3c697a99ac (patch)
tree39d0165cd0bb7394c7c157de93b6a483463d351f /tools
parent1ebc7b082b3c09b70029a1cc8e36109c1f027d6b (diff)
downloadchromium_src-ab73919a44d827bbf685873ae283fc3c697a99ac.zip
chromium_src-ab73919a44d827bbf685873ae283fc3c697a99ac.tar.gz
chromium_src-ab73919a44d827bbf685873ae283fc3c697a99ac.tar.bz2
Rename tab_backend to inspector_backend.
BUG=None TEST=run_tests Review URL: https://codereview.chromium.org/12079070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/telemetry/telemetry/inspector_backend.py (renamed from tools/telemetry/telemetry/tab_backend.py)6
-rw-r--r--tools/telemetry/telemetry/inspector_console.py8
-rw-r--r--tools/telemetry/telemetry/inspector_page.py16
-rw-r--r--tools/telemetry/telemetry/inspector_runtime.py8
-rw-r--r--tools/telemetry/telemetry/inspector_timeline.py10
-rw-r--r--tools/telemetry/telemetry/tab_list_backend.py9
6 files changed, 29 insertions, 28 deletions
diff --git a/tools/telemetry/telemetry/tab_backend.py b/tools/telemetry/telemetry/inspector_backend.py
index e2ba29c..b2ec53c 100644
--- a/tools/telemetry/telemetry/tab_backend.py
+++ b/tools/telemetry/telemetry/inspector_backend.py
@@ -18,7 +18,7 @@ from telemetry import websocket
class InspectorException(Exception):
pass
-class TabBackend(object):
+class InspectorBackend(object):
def __init__(self, browser, browser_backend, debugger_url):
assert debugger_url
self._browser = browser
@@ -278,14 +278,14 @@ class TabBackend(object):
domain_name, notification_handler, will_close_handler):
"""Registers a given domain for handling notification methods.
- For example, given tab_backend:
+ For example, given inspector_backend:
def OnConsoleNotification(msg):
if msg['method'] == 'Console.messageAdded':
print msg['params']['message']
return
def OnConsoleClose(self):
pass
- tab_backend.RegisterDomain('Console',
+ inspector_backend.RegisterDomain('Console',
OnConsoleNotification, OnConsoleClose)
"""
assert domain_name not in self._domain_handlers
diff --git a/tools/telemetry/telemetry/inspector_console.py b/tools/telemetry/telemetry/inspector_console.py
index a4dd16b..cea1495 100644
--- a/tools/telemetry/telemetry/inspector_console.py
+++ b/tools/telemetry/telemetry/inspector_console.py
@@ -5,9 +5,9 @@ import json
import logging
class InspectorConsole(object):
- def __init__(self, tab_backend):
- self._tab_backend = tab_backend
- self._tab_backend.RegisterDomain(
+ def __init__(self, inspector_backend):
+ self._inspector_backend = inspector_backend
+ self._inspector_backend.RegisterDomain(
'Console',
self._OnNotification,
self._OnClose)
@@ -53,7 +53,7 @@ class InspectorConsole(object):
method_name = 'enable'
else:
method_name = 'disable'
- self._tab_backend.SyncRequest({
+ self._inspector_backend.SyncRequest({
'method': 'Console.%s' % method_name
})
self._console_enabled = enabled
diff --git a/tools/telemetry/telemetry/inspector_page.py b/tools/telemetry/telemetry/inspector_page.py
index 3551e37f..4056ca4 100644
--- a/tools/telemetry/telemetry/inspector_page.py
+++ b/tools/telemetry/telemetry/inspector_page.py
@@ -7,9 +7,9 @@ import logging
from telemetry import util
class InspectorPage(object):
- def __init__(self, tab_backend):
- self._tab_backend = tab_backend
- self._tab_backend.RegisterDomain(
+ def __init__(self, inspector_backend):
+ self._inspector_backend = inspector_backend
+ self._inspector_backend.RegisterDomain(
'Page',
self._OnNotification,
self._OnClose)
@@ -38,14 +38,14 @@ class InspectorPage(object):
request = {
'method': 'Page.enable'
}
- res = self._tab_backend.SyncRequest(request, timeout)
+ res = self._inspector_backend.SyncRequest(request, timeout)
assert len(res['result'].keys()) == 0
def DisablePageNotifications():
request = {
'method': 'Page.disable'
}
- res = self._tab_backend.SyncRequest(request, timeout)
+ res = self._inspector_backend.SyncRequest(request, timeout)
assert len(res['result'].keys()) == 0
self._navigation_pending = True
@@ -56,7 +56,7 @@ class InspectorPage(object):
raise
def IsNavigationDone(time_left):
- self._tab_backend.DispatchNotifications(time_left)
+ self._inspector_backend.DispatchNotifications(time_left)
return not self._navigation_pending
util.WaitFor(IsNavigationDone, timeout, pass_time_left_to_func=True)
@@ -78,7 +78,7 @@ class InspectorPage(object):
'url': url,
}
}
- self._tab_backend.SendAndIgnoreResponse(request)
+ self._inspector_backend.SendAndIgnoreResponse(request)
self.PerformActionAndWaitForNavigate(DoNavigate, timeout)
@@ -87,7 +87,7 @@ class InspectorPage(object):
request = {
'method': 'Page.getCookies'
}
- res = self._tab_backend.SyncRequest(request, timeout)
+ res = self._inspector_backend.SyncRequest(request, timeout)
cookies = res['result']['cookies']
for cookie in cookies:
if cookie['name'] == name:
diff --git a/tools/telemetry/telemetry/inspector_runtime.py b/tools/telemetry/telemetry/inspector_runtime.py
index 6b27baa..4479b66 100644
--- a/tools/telemetry/telemetry/inspector_runtime.py
+++ b/tools/telemetry/telemetry/inspector_runtime.py
@@ -5,9 +5,9 @@ class EvaluateException(Exception):
pass
class InspectorRuntime(object):
- def __init__(self, tab_backend):
- self._tab_backend = tab_backend
- self._tab_backend.RegisterDomain(
+ def __init__(self, inspector_backend):
+ self._inspector_backend = inspector_backend
+ self._inspector_backend.RegisterDomain(
'Runtime',
self._OnNotification,
self._OnClose)
@@ -44,7 +44,7 @@ class InspectorRuntime(object):
'returnByValue': True
}
}
- res = self._tab_backend.SyncRequest(request, timeout)
+ res = self._inspector_backend.SyncRequest(request, timeout)
if 'error' in res:
raise EvaluateException(res['error']['message'])
diff --git a/tools/telemetry/telemetry/inspector_timeline.py b/tools/telemetry/telemetry/inspector_timeline.py
index b0663dc..633aefc 100644
--- a/tools/telemetry/telemetry/inspector_timeline.py
+++ b/tools/telemetry/telemetry/inspector_timeline.py
@@ -20,8 +20,8 @@ class InspectorTimeline(object):
def __exit__(self, *args):
self._tab.StopTimelineRecording()
- def __init__(self, tab_backend):
- self._tab_backend = tab_backend
+ def __init__(self, inspector_backend):
+ self._inspector_backend = inspector_backend
self._is_recording = False
self._timeline_model = None
@@ -34,7 +34,7 @@ class InspectorTimeline(object):
return
self._is_recording = True
self._timeline_model = TimelineModel()
- self._tab_backend.RegisterDomain('Timeline',
+ self._inspector_backend.RegisterDomain('Timeline',
self._OnNotification, self._OnClose)
req = {'method': 'Timeline.start'}
self._SendSyncRequest(req)
@@ -46,10 +46,10 @@ class InspectorTimeline(object):
self._timeline_model.DidFinishRecording()
req = {'method': 'Timeline.stop'}
self._SendSyncRequest(req)
- self._tab_backend.UnregisterDomain('Timeline')
+ self._inspector_backend.UnregisterDomain('Timeline')
def _SendSyncRequest(self, req, timeout=60):
- res = self._tab_backend.SyncRequest(req, timeout)
+ res = self._inspector_backend.SyncRequest(req, timeout)
if 'error' in res:
raise TabBackendException(res['error']['message'])
return res['result']
diff --git a/tools/telemetry/telemetry/tab_list_backend.py b/tools/telemetry/telemetry/tab_list_backend.py
index feda0b4..a6ed8f8 100644
--- a/tools/telemetry/telemetry/tab_list_backend.py
+++ b/tools/telemetry/telemetry/tab_list_backend.py
@@ -9,7 +9,7 @@ import weakref
from telemetry import browser_gone_exception
from telemetry import tab
-from telemetry import tab_backend
+from telemetry import inspector_backend
from telemetry import util
class BrowserConnectionGoneException(
@@ -102,9 +102,10 @@ class TabListBackend(object):
# Lazily get/create a Tab object.
tab_object = self._tab_dict.get(debugger_url)
if not tab_object:
- backend = tab_backend.TabBackend(self._browser_backend.browser,
- self._browser_backend,
- debugger_url)
+ backend = inspector_backend.InspectorBackend(
+ self._browser_backend.browser,
+ self._browser_backend,
+ debugger_url)
tab_object = tab.Tab(backend)
self._tab_dict[debugger_url] = tab_object
return tab_object