Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
index ac0c532fa4477b3af9b642487da6b238f0ff5b34..a0eab96f1c4e8267efa8aaa28ef305d098ac0332 100644 |
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
@@ -13,6 +13,7 @@ import sys |
from telemetry import decorators |
from telemetry.core import browser |
from telemetry.core import platform |
+from telemetry.core import platform as platform_module |
from telemetry.core import possible_browser |
from telemetry.core import util |
from telemetry.core.backends import adb_commands |
@@ -93,14 +94,18 @@ class PossibleAndroidBrowser(possible_browser.PossibleBrowser): |
def __repr__(self): |
return 'PossibleAndroidBrowser(browser_type=%s)' % self.browser_type |
- @property |
- @decorators.Cache |
- def _platform_backend(self): |
- return android_platform_backend.AndroidPlatformBackend( |
+ def _InitPlatformIfNeeded(self): |
+ if self._platform: |
+ return |
+ |
+ self._platform_backend = android_platform_backend.AndroidPlatformBackend( |
self._backend_settings.adb.device(), |
self.finder_options.no_performance_mode) |
+ self._platform = platform_module.Platform(self._platform_backend) |
def Create(self): |
+ self._InitPlatformIfNeeded() |
+ |
use_rndis_forwarder = (self.finder_options.android_rndis or |
self.finder_options.browser_options.netsim or |
platform.GetHostPlatform().GetOSName() != 'linux') |