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

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

Issue 18907002: Reland r210268: "Improve forwarder2 setup/tear down in telemetry." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/adb_commands.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/chrome/android_browser_backend.py
diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py
index 3677f0119b6fbfac6a7cb9efe205f9074963f7d4..d80614c490905b879e1f8a35be5b635ee29b9773 100644
--- a/tools/telemetry/telemetry/core/chrome/android_browser_backend.py
+++ b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py
@@ -163,7 +163,10 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
# Kill old browser.
self._adb.CloseApplication(self._backend_settings.package)
- self._adb.KillAll('device_forwarder')
+
+ adb_commands.Forwarder.KillDevice(self._adb)
+ if not options.keep_test_server_ports:
+ adb_commands.Forwarder.KillHost()
if self._adb.Adb().CanAccessProtectedFileContents():
if not options.dont_override_profile:
« no previous file with comments | « tools/telemetry/telemetry/core/chrome/adb_commands.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698