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

chrome/browser/password_manager/password_manager_delegate_impl.cc

 // 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.
 
 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"
 
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 113 matching lines @@
           disable_popup));
 }
 
 void PasswordManagerDelegateImpl::AddSavePasswordInfoBarIfPermitted(
     PasswordFormManager* form_to_save) {
   // Don't show the password manager infobar if this form is for a google
   // account and we are going to show the one-click singin infobar.
   // For now, one-click signin is fully implemented only on windows.
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   GURL realm(form_to_save->realm());
-  if (realm == GURL(GaiaUrls::GetInstance()->gaia_login_form_realm()) &&
-      OneClickSigninHelper::CanOffer(tab_contents_->web_contents(), true)) {
+  // TODO(mathp): Checking only against associated_username() causes a bug
+  // referenced here: crbug.com/133275
+  if ((realm == GURL(GaiaUrls::GetInstance()->gaia_login_form_realm()) ||
+      realm == GURL("https://www.google.com/")) &&
+      OneClickSigninHelper::CanOffer(tab_contents_->web_contents(),
+          UTF16ToUTF8(form_to_save->associated_username()), true)) {
     return;
   }
 #endif
 
   tab_contents_->infobar_tab_helper()->AddInfoBar(
       new SavePasswordInfoBarDelegate(
           tab_contents_->infobar_tab_helper(), form_to_save));
 }
 
 Profile* PasswordManagerDelegateImpl::GetProfile() {
   return tab_contents_->profile();
 }
 
 bool PasswordManagerDelegateImpl::DidLastPageLoadEncounterSSLErrors() {
   content::NavigationEntry* entry =
       tab_contents_->web_contents()->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return false;
   }
 
   return net::IsCertStatusError(entry->GetSSL().cert_status);
 }