Make sure to display an errors that occur during the chrome sign in process

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/api/infobars/confirm_infobar_delegate.h"
@@ skipping 135 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());
+  int error_message_id = 0;

[Andrew T Wilson (Slow), 2012/12/03 14:54:49]

I guess we're trying to ignore the error message since this isn't used below -
perhaps you should support passing NULL instead since it's clearer?

[Roger Tawa OOO till Jul 10th, 2012/12/03 22:26:54]

Done.

   // 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(web_contents_,
-          UTF16ToUTF8(form_to_save->associated_username()), true)) {
+          OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+          UTF16ToUTF8(form_to_save->associated_username()),
+          &error_message_id)) {
     return;
   }
 #endif
 
   InfoBarTabHelper* infobar_tab_helper =
       InfoBarTabHelper::FromWebContents(web_contents_);
   infobar_tab_helper->AddInfoBar(
       new SavePasswordInfoBarDelegate(infobar_tab_helper, form_to_save));
 }
 
 Profile* PasswordManagerDelegateImpl::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 bool PasswordManagerDelegateImpl::DidLastPageLoadEncounterSSLErrors() {
   content::NavigationEntry* entry =
       web_contents_->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return false;
   }
 
   return net::IsCertStatusError(entry->GetSSL().cert_status);
 }