diff options
| author | tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 20:06:34 +0000 |
|---|---|---|
| committer | tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 20:06:34 +0000 |
| commit | edef1c25eb44529879f759b46719bfed1fdfe4ff (patch) | |
| tree | aeafa6bb51ab25b34bf85e547618e7ec2439f26f | |
| parent | 627d19939bc101e367c3cc25164a849f6937b06a (diff) | |
| download | chromium_src-edef1c25eb44529879f759b46719bfed1fdfe4ff.zip chromium_src-edef1c25eb44529879f759b46719bfed1fdfe4ff.tar.gz chromium_src-edef1c25eb44529879f759b46719bfed1fdfe4ff.tar.bz2 | |
Revert of [Telemetry] Create ForwarderFactory earlier on CrOS. (https://codereview.chromium.org/144283006/)
Reason for revert:
See https://codereview.chromium.org/134863005.
Original issue's description:
> [Telemetry] Create ForwarderFactory earlier on CrOS.
>
> BUG=
> TBR=tonyg@chromium.org
> NOTRY=True
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=250448
TBR=tonyg@chromium.org,tonyg@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/143293004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250483 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py index 8873824..0157158 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py @@ -5,8 +5,6 @@ import logging import os -from telemetry import decorators - from telemetry.core import exceptions from telemetry.core import forwarders from telemetry.core import util @@ -215,6 +213,7 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): 'array:string:"%s"' % ','.join(startup_args)] self._cri.RunCmdOnDevice(args) + self._forwarder_factory = cros_forwarder.CrOsForwarderFactory(self._cri) self._forwarder = self.forwarder_factory.Create( forwarders.PortPairs( http=forwarders.PortPair(util.GetUnreservedAvailableLocalPort(), @@ -273,9 +272,8 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): self._cri = None @property - @decorators.Cache def forwarder_factory(self): - return cros_forwarder.CrOsForwarderFactory(self._cri) + return self._forwarder_factory def IsBrowserRunning(self): return bool(self.pid) |