OOBE sign in fixes for enterprise_PowerManagement

tools/telemetry/telemetry/core/backends/chrome/oobe.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 
 from telemetry.core import exceptions
 from telemetry.core import util
 from telemetry.core import web_contents
 
@@ skipping 73 matching lines @@
     self.ExecuteJavaScriptInContext("""
         document.getElementById('Email').value='%s';
         document.getElementById('Passwd').value='%s';
         document.getElementById('signIn').click();"""
             % (username, password),
         gaia_iframe_context)
 
   def _NavigateWebViewLogin(self, username, password):
     """Logs into the webview-based GAIA screen"""
     self._NavigateWebViewEntry('identifierId', username)
+    self._GaiaWebViewContext().WaitForJavaScriptExpression(
+        "document.getElementById('identifierId') == null", 20)
+
     self._NavigateWebViewEntry('password', password)
+    util.WaitFor(lambda: self._GaiaWebViewContext() == None, 20)
 
   def _NavigateWebViewEntry(self, field, value):
     self._WaitForField(field)
     self._WaitForField('next')
     gaia_webview_context = self._GaiaWebViewContext()
     gaia_webview_context.EvaluateJavaScript("""
        document.getElementById('%s').value='%s';
        document.getElementById('next').click()"""
            % (field, value))
-    gaia_webview_context.WaitForJavaScriptExpression(
-        "document.getElementById('%s') == null" % field, 20)
 
   def _WaitForField(self, field_id):
     gaia_webview_context = util.WaitFor(self._GaiaWebViewContext, 5)
     util.WaitFor(gaia_webview_context.HasReachedQuiescence, 20)
     gaia_webview_context.WaitForJavaScriptExpression(
         "document.getElementById('%s') != null" % field_id, 20)