Revert 138289 - Fix and enable testPasswordAutofilledInIncognito.

chrome/test/functional/passwords.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.
 
 import os
-from urlparse import urlparse
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 import test_utils
 from webdriver_pages import settings
 
 
 class PasswordTest(pyauto.PyUITest):
   """Tests that passwords work correctly."""
 
   INFOBAR_TYPE = 'password_infobar'
   URL = 'https://accounts.google.com/ServiceLogin'
   URL_HTTPS = 'https://accounts.google.com/Login'
   URL_LOGOUT = 'https://accounts.google.com/Logout'
-  HOSTNAME = 'https://' + urlparse(URL).netloc
-  USERNAME_ELEM = 'Email'
-  PASSWORD_ELEM = 'Passwd'
-  USERNAME = 'test@google.com'
-  PASSWORD = 'test.password'
 
   def Debug(self):
     """Test method for experimentation.
 
     This method will not run automatically.
     """
     while True:
       raw_input('Interact with the browser and hit <enter> to dump passwords. ')
       print '*' * 20
       self.pprint(self.GetSavedPasswords())
@@ skipping 42 matching lines @@
     # Wait until username/password is filled by the Password manager on the
     # login page.
     js_template = """
       var value = "";
       var element = document.getElementById("%s");
       if (element)
         value = element.value;
       window.domAutomationController.send(value);
     """
     self.assertTrue(self.WaitUntil(
-        lambda: self.ExecuteJavascript(js_template % self.USERNAME_ELEM,
+        lambda: self.ExecuteJavascript(js_template % 'Email',
                                       tab_index, window_index) != '' and
-                self.ExecuteJavascript(js_template % self.PASSWORD_ELEM,
+                self.ExecuteJavascript(js_template % 'Passwd',
                                       tab_index, window_index) != ''))
 
   def testSavePassword(self):
     """Test saving a password and getting saved passwords."""
     password1 = self._ConstructPasswordDictionary(
         'user@example.com', 'test.password',
         'https://www.example.com/', 'https://www.example.com/login',
         'username', 'password', 'https://www.example.com/login/')
     self.assertTrue(self.AddSavedPassword(password1))
     self.assertEqual(self.GetSavedPasswords(), [password1])
@@ skipping 113 matching lines @@
     self.assertEqual(email_value, '',
                     msg='Email creds displayed %s.' % email_value)
     self.assertEqual(passwd_value, '', msg='Password creds displayed.')
 
   def testPasswordAutofilledInIncognito(self):
     """Verify saved password is autofilled in Incognito mode.
 
     Saved passwords should be autofilled once the username is entered in
     incognito mode.
     """
-    action_target = self.HOSTNAME
-
     driver = self.NewWebDriver()
+    username = 'test@google.com'
+    password = 'test.password'
     password_dict = self._ConstructPasswordDictionary(
-        self.USERNAME, self.PASSWORD, self.HOSTNAME, self.URL,
-        self.USERNAME_ELEM, self.PASSWORD_ELEM, action_target)
+        username, password,
+        'https://www.google.com/', 'https://www.google.com/accounts',
+        'Email', 'Passwd', 'https://www.google.com/accounts')
     self.AddSavedPassword(password_dict)
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.NavigateToURL(self.URL, 1, 0)
     # Switch to window 1.
     driver.switch_to_window(driver.window_handles[1])
-    driver.find_element_by_id(
-        self.USERNAME_ELEM).send_keys(self.USERNAME + '\t')
+    driver.find_element_by_id('Email').send_keys(username + '\t')
     incognito_passwd = self.GetDOMValue(
         'document.getElementById("Passwd").value', tab_index=0, windex=1)
-    self.assertEqual(incognito_passwd, self.PASSWORD,
-                     msg='Password creds did not autofill in incognito mode.')
+    self.assertEqual(incognito_passwd, password,
+                    msg='Password creds did not autofill in incognito mode.')
 
   def testInfoBarDisappearByNavigatingPage(self):
     """Test password infobar is dismissed when navigating to different page."""
     creds = self.GetPrivateInfo()['test_google_account']
     # Disable one-click login infobar for sync.
     self.SetPrefs(pyauto.kReverseAutologinEnabled, False)
     # Login to Google account.
     test_utils.GoogleAccountsLogin(self, creds['username'], creds['password'])
     self.PerformActionOnInfobar(
         'accept', infobar_index=test_utils.WaitForInfobarTypeAndGetIndex(
@@ skipping 16 matching lines @@
             self, self.INFOBAR_TYPE))
     self.GetBrowserWindow(0).GetTab(0).Reload()
     test_utils.AssertInfobarTypeDoesNotAppear(self, self.INFOBAR_TYPE)
 
   def testPasswdInfoNotStoredWhenAutocompleteOff(self):
     """Verify that password infobar does not appear when autocomplete is off.
 
     If the password field has autocomplete turned off, then the password infobar
     should not offer to save the password info.
     """
-    password_info = {'Email': self.USERNAME,
-                     'Passwd': self.PASSWORD}
+    password_info = {'Email': 'test@google.com',
+                     'Passwd': 'test12345'}
 
     # Disable one-click login infobar for sync.
     self.SetPrefs(pyauto.kReverseAutologinEnabled, False)
     url = self.GetHttpURLForDataPath(
         os.path.join('password', 'password_autocomplete_off_test.html'))
     self.NavigateToURL(url)
     for key, value in password_info.iteritems():
       script = ('document.getElementById("%s").value = "%s"; '
                 'window.domAutomationController.send("done");') % (key, value)
       self.ExecuteJavascript(script, 0, 0)
@@ skipping 62 matching lines @@
     password = creds['password']
     # Block cookies for Google accounts domain.
     self.SetPrefs(pyauto.kContentSettingsPatternPairs,
                   {'https://accounts.google.com/': {'cookies': 2}})
     test_utils.GoogleAccountsLogin(self, username, password)
     test_utils.WaitForInfobarTypeAndGetIndex(self, self.INFOBAR_TYPE)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()