Change infobar creation to use a public static Create() method on the infobar delegate classes.

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 20 matching lines @@
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PasswordManagerDelegateImpl);
 
 // After a successful *new* login attempt, we take the PasswordFormManager in
 // provisional_save_manager_ and move it to a SavePasswordInfoBarDelegate while
 // the user makes up their mind with the "save password" infobar. Note if the
 // login is one we already know about, the end of the line is
 // provisional_save_manager_ because we just update it on success and so such
 // forms never end up in an infobar.
 class SavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  SavePasswordInfoBarDelegate(InfoBarService* infobar_service,
-                              PasswordFormManager* form_to_save);
+  // If we won't be showing the one-click signin infobar, creates a save
+  // password delegate and adds it to the InfoBarService for |web_contents|.
+  static void Create(content::WebContents* web_contents,
+                     PasswordFormManager* form_to_save);
 
  private:
   enum ResponseType {
     NO_RESPONSE = 0,
     REMEMBER_PASSWORD,
     DONT_REMEMBER_PASSWORD,
     NUM_RESPONSE_TYPES,
   };
 
+  SavePasswordInfoBarDelegate(InfoBarService* infobar_service,
+                              PasswordFormManager* form_to_save);
   virtual ~SavePasswordInfoBarDelegate();
 
   // ConfirmInfoBarDelegate
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
   virtual InfoBarAutomationType GetInfoBarAutomationType() const OVERRIDE;
 
   // The PasswordFormManager managing the form we're asking the user about,
   // and should update as per her decision.
   scoped_ptr<PasswordFormManager> form_to_save_;
 
   // Used to track the results we get from the info bar.
   ResponseType infobar_response_;
 
   DISALLOW_COPY_AND_ASSIGN(SavePasswordInfoBarDelegate);
 };
 
+// static
+void SavePasswordInfoBarDelegate::Create(content::WebContents* web_contents,
+                                         PasswordFormManager* form_to_save) {
+#if defined(ENABLE_ONE_CLICK_SIGNIN)
+  // 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.
+  GURL realm(form_to_save->realm());
+  // 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,
+          OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+          UTF16ToUTF8(form_to_save->associated_username()), NULL)) {
+    return;
+  }
+#endif
+
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents);
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new SavePasswordInfoBarDelegate(infobar_service, form_to_save)));
+}
+
 SavePasswordInfoBarDelegate::SavePasswordInfoBarDelegate(
     InfoBarService* infobar_service,
     PasswordFormManager* form_to_save)
     : ConfirmInfoBarDelegate(infobar_service),
       form_to_save_(form_to_save),
       infobar_response_(NO_RESPONSE) {
 }
 
 SavePasswordInfoBarDelegate::~SavePasswordInfoBarDelegate() {
   UMA_HISTOGRAM_ENUMERATION("PasswordManager.InfoBarResponse",
@@ skipping 56 matching lines @@
 
   web_contents_->GetRenderViewHost()->Send(
       new AutofillMsg_FillPasswordForm(
           web_contents_->GetRenderViewHost()->GetRoutingID(),
           form_data,
           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());
-  // 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_,
-          OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
-          UTF16ToUTF8(form_to_save->associated_username()), NULL)) {
-    return;
-  }
-#endif
-
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents_);
-  infobar_service->AddInfoBar(
-      new SavePasswordInfoBarDelegate(infobar_service, form_to_save));
+  SavePasswordInfoBarDelegate::Create(web_contents_, 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);
 }