Fix to enable the cached credentials login test

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 4584 matching lines @@
     cmd_dict = { 'command': 'LoginAsGuest' }
     # Currently, logging in as guest causes session_manager to
     # restart Chrome, which will close the testing channel.
     # We need to call SetUp() again to reconnect to the new channel.
     assert self._WaitForInodeChange(
         self._named_channel_id,
         lambda: self._GetResultFromJSONRequest(cmd_dict, windex=None)), \
         'Chrome did not reopen the testing channel after login as guest.'
     self.SetUp()
 
-  def Login(self, username, password):
+  def Login(self, username, password, use_cached_credentials=False):
     """Login to chromeos.
 
     Waits until logged in and browser is ready.
     Should be displaying the login screen to work.
 
     Note that in case of webui auth-extension-based login, gaia auth errors
     will not be noticed here, because the browser has no knowledge of it. In
     this case the GetNextEvent automation command will always time out.
 
+    Args:
+      username, password: User credentials for login.
+      use_cached_credentials: Should we login with cached credentials or
+      resubmit credentials and wait for validation?
+
     Returns:
       An error string if an error occured.
       None otherwise.
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     self._GetResultFromJSONRequest({'command': 'AddLoginEventObserver'},
                                    windex=None)
     cmd_dict = {
         'command': 'SubmitLoginForm',
         'username': username,
         'password': password,
+        'use_cached_credentials': use_cached_credentials,
     }
     self._GetResultFromJSONRequest(cmd_dict, windex=None)
     self.AddDomEventObserver('loginfail', automation_id=4444)
     try:
-      # TODO(craigdh): Add login failure events once PyAuto switches to mocked
-      # GAIA authentication.
       if self.GetNextEvent().get('name') == 'loginfail':
         raise JSONInterfaceError('Login denied by auth server.')
     except JSONInterfaceError as e:
       raise JSONInterfaceError('Login failed. Perhaps Chrome crashed, '
                                'failed to start, or the login flow is '
                                'broken? Error message: %s' % str(e))
 
   def Logout(self):
     """Log out from ChromeOS and wait for session_manager to come up.
 
@@ skipping 1893 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()