Address bug where the one-click sign-in bar would never show again once

chrome/test/functional/infobars.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 logging
 import os
 import re
 
 import pyauto_functional  # Must be imported before pyauto
@@ skipping 178 matching lines @@
   OC_INFOBAR_TYPE = 'oneclicklogin_infobar'
   PW_INFOBAR_TYPE = 'password_infobar'
   URL = 'https://www.google.com/accounts/ServiceLogin'
   URL_LOGIN = 'https://www.google.com/accounts/Login'
   URL_LOGOUT = 'https://www.google.com/accounts/Logout'
 
   def setUp(self):
     pyauto.PyUITest.setUp(self)
     self._driver = self.NewWebDriver()
 
-  def _LogIntoGoogleAccount(self, tab_index=0, windex=0):
+  def _LogIntoGoogleAccount(self, test_account='test_google_account',
+                            tab_index=0, windex=0):
     """Log into Google account.
 
     Args:
       tab_index: The tab index, default is 0.
       windex: The window index, default is 0.
     """
-    creds = self.GetPrivateInfo()['test_google_account']
+    creds = self.GetPrivateInfo()[test_account]
     username = creds['username']
     password = creds['password']
     test_utils.GoogleAccountsLogin(self, username, password, tab_index, windex)
     # TODO(dyu): Use WaitUntilNavigationCompletes after investigating
     # crbug.com/124877
     self.WaitUntil(
         lambda: self.GetDOMValue('document.readyState'),
         expect_retval='complete')
 
   def _PerformActionOnInfobar(self, action):
@@ skipping 27 matching lines @@
                     msg='The one-click login infobar did not appear.')
 
   def testDisplayOneClickInfobar(self):
     """Verify one-click infobar appears after login into google account.
 
     One-click infobar should appear after signing into a google account
     for the first time using a clean profile.
     """
     self._DisplayOneClickInfobar()
 
-  def testNoOneClickInfobarAfterCancel(self):
-    """Verify one-click infobar does not appear again after clicking cancel.
+  def testNoOneClickInfobarAfterCancelSameAccount(self):
+    """Verify one-click infobar does not appear after clicking cancel.
 
     The one-click infobar should not display again after logging into an
     account and selecting to reject sync the first time. The test covers
     restarting the browser with the same profile and verifying the one-click
     infobar does not show after login.
 
     This test also verifies that the password infobar displays.
     """
     self._DisplayOneClickInfobar()
     self._PerformActionOnInfobar(action='cancel')  # Click 'No thanks' button.
     self.NavigateToURL(self.URL_LOGOUT)
     self._LogIntoGoogleAccount()
     test_utils.WaitForInfobarTypeAndGetIndex(self, self.PW_INFOBAR_TYPE)
     test_utils.AssertInfobarTypeDoesNotAppear(self, self.OC_INFOBAR_TYPE)
     # Restart browser with the same profile.
     self.RestartBrowser(clear_profile=False)
     self.NavigateToURL(self.URL_LOGOUT)
     self._LogIntoGoogleAccount()
     test_utils.AssertInfobarTypeDoesNotAppear(self, self.OC_INFOBAR_TYPE)
+    test_utils.WaitForInfobarTypeAndGetIndex(self, self.PW_INFOBAR_TYPE)
+
+  def testOneClickInfobarAppearsAfterCancelDifferentAccount(self):
+    """Verify one-click infobar appears again with different account.
+
+    The one-click infobar should display again after logging into an
+    account and selecting to reject sync, but logging again with another
+    account. The test covers restarting the browser with the same profile
+    but logging in with another account, and verifying the one-click infobar
+    does show after login.
+
+    This test also verifies that the password infobar does not display
+    in this case.
+    """
+    self._DisplayOneClickInfobar()
+    self._PerformActionOnInfobar(action='cancel')  # Click 'No thanks' button.
+    self.NavigateToURL(self.URL_LOGOUT)
+    # Restart browser with the same profile.
+    self.RestartBrowser(clear_profile=False)
+    self._LogIntoGoogleAccount('test_google_account_2') # Different account.
+    test_utils.WaitForInfobarTypeAndGetIndex(self, self.OC_INFOBAR_TYPE)
+    test_utils.AssertInfobarTypeDoesNotAppear(self, self.PW_INFOBAR_TYPE)
 
   def testDisplayOneClickInfobarAfterDismiss(self):
     """Verify one-click infobar appears again after clicking dismiss button.
 
     The one-click infobar should display again after logging into an
     account and clicking to dismiss the infobar the first time.
 
     This test also verifies that the password infobar does not display.
     The one-click infobar should supersede the password infobar.
     """
@@ skipping 71 matching lines @@
   def testNoOneClickInfobarInIncognito(self):
     """Verify that one-click infobar does not show up in incognito mode."""
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self._LogIntoGoogleAccount(windex=1)
     test_utils.AssertInfobarTypeDoesNotAppear(
         self, self.OC_INFOBAR_TYPE, windex=1)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()