diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 21:48:02 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 21:48:02 +0000 |
| commit | b042ecf69a057ca5ed09540e1a1b6aef28a8ee62 (patch) | |
| tree | 45caa0e861584da9b6df82b0c84efe408aea4526 /tools/telemetry | |
| parent | bf21ee1133b4b2d4187b71675cea68934adc8703 (diff) | |
| download | chromium_src-b042ecf69a057ca5ed09540e1a1b6aef28a8ee62.zip chromium_src-b042ecf69a057ca5ed09540e1a1b6aef28a8ee62.tar.gz chromium_src-b042ecf69a057ca5ed09540e1a1b6aef28a8ee62.tar.bz2 | |
Move DoNothingForwarder to browser_backend.
BUG=161406
TEST=manual
NOTRY=true
Review URL: https://codereview.chromium.org/12679012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191674 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
3 files changed, 14 insertions, 27 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/browser_backend.py b/tools/telemetry/telemetry/core/chrome/browser_backend.py index dce70e6..52c3e49 100644 --- a/tools/telemetry/telemetry/core/chrome/browser_backend.py +++ b/tools/telemetry/telemetry/core/chrome/browser_backend.py @@ -210,3 +210,15 @@ class BrowserBackend(object): def GetStandardOutput(self): raise NotImplementedError() + +class DoNothingForwarder(object): + def __init__(self, *port_pairs): + self._host_port = port_pairs[0].local_port + + @property + def url(self): + assert self._host_port + return 'http://127.0.0.1:%i' % self._host_port + + def Close(self): + self._host_port = None diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py index cdc864a..15840c6 100644 --- a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py @@ -146,7 +146,7 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend): def CreateForwarder(self, *port_pairs): assert self._cri - return (DoNothingForwarder(*port_pairs) if self._cri.local + return (browser_backend.DoNothingForwarder(*port_pairs) if self._cri.local else SSHForwarder(self._cri, 'R', *port_pairs)) def _RestartUI(self): @@ -196,15 +196,3 @@ class SSHForwarder(object): self._proc.kill() self._proc = None - -class DoNothingForwarder(object): - def __init__(self, *port_pairs): - self._host_port = port_pairs[0].local_port - - @property - def url(self): - assert self._host_port - return 'http://localhost:%i' % self._host_port - - def Close(self): - self._host_port = None diff --git a/tools/telemetry/telemetry/core/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/core/chrome/desktop_browser_backend.py index 4e94d93..d8ace00 100644 --- a/tools/telemetry/telemetry/core/chrome/desktop_browser_backend.py +++ b/tools/telemetry/telemetry/core/chrome/desktop_browser_backend.py @@ -148,17 +148,4 @@ class DesktopBrowserBackend(browser_backend.BrowserBackend): self._tmp_output_file = None def CreateForwarder(self, *port_pairs): - return DoNothingForwarder(*port_pairs) - - -class DoNothingForwarder(object): - def __init__(self, *port_pairs): - self._host_port = port_pairs[0].local_port - - @property - def url(self): - assert self._host_port - return 'http://127.0.0.1:%i' % self._host_port - - def Close(self): - self._host_port = None + return browser_backend.DoNothingForwarder(*port_pairs) |