Index: tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py |
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 4ee791c648773cfff7173a2c05f638d993cb35f3..751d28544e1b408682402f1696f4960492091a68 100644 |
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py |
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py |
@@ -233,20 +233,16 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): |
not self.oobe_exists) |
def _WaitForLogin(self): |
- if self._is_guest: |
- self._WaitForBrowserToComeUp() |
- util.WaitFor(self._IsCryptohomeMounted, 30) |
- return |
- |
# Wait for cryptohome to mount. |
util.WaitFor(self._IsLoggedIn, 60) |
# Wait for extensions to load. |
self._WaitForBrowserToComeUp() |
- # Workaround for crbug.com/329271, crbug.com/334726. |
+ # Workaround for crbug.com/374462 - the bug doesn't manifest in the guest |
+ # session, which also starts with an open browser tab. |
retries = 3 |
- while True: |
+ while not self._is_guest: |
try: |
# Open a new window/tab. |
tab = self.tab_list_backend.New(timeout=30) |