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

chrome/browser/ui/sync/one_click_signin_helper.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/ui/sync/one_click_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
@@ skipping 214 matching lines @@
     static_cast<const void* const>(
         &OneClickSigninRequestUserData::kUserDataKey);
 
 }  // namespace
 
 // The infobar asking the user if they want to use one-click sign in.
 // TODO(rogerta): once we move to a web-based sign in flow, we can get rid
 // of this infobar.
 class OneClickInfoBarDelegateImpl : public OneClickSigninInfoBarDelegate {
  public:
+  // Creates a one click signin delegate and adds it to |infobar_service|.
+  static void Create(InfoBarService* infobar_service,
+                     const std::string& session_index,
+                     const std::string& email,
+                     const std::string& password);
+
+ private:
   OneClickInfoBarDelegateImpl(InfoBarService* owner,
-                              const std::string& session_index,
-                              const std::string& email,
-                              const std::string& password);
+                               const std::string& session_index,
+                               const std::string& email,
+                               const std::string& password);
   virtual ~OneClickInfoBarDelegateImpl();
 
- private:
   // InfoBarDelegate overrides.
   virtual InfoBarAutomationType GetInfoBarAutomationType() const OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
 
   // ConfirmInfoBarDelegate overrides.
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
@@ skipping 11 matching lines @@
   std::string session_index_;
   std::string email_;
   std::string password_;
 
   // Whether any UI controls in the infobar were pressed or not.
   bool button_pressed_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickInfoBarDelegateImpl);
 };
 
+// static
+void OneClickInfoBarDelegateImpl::Create(InfoBarService* infobar_service,
+                                         const std::string& session_index,
+                                         const std::string& email,
+                                         const std::string& password) {
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new OneClickInfoBarDelegateImpl(infobar_service, session_index, email,
+                                      password)));
+}
+
 OneClickInfoBarDelegateImpl::OneClickInfoBarDelegateImpl(
     InfoBarService* owner,
     const std::string& session_index,
     const std::string& email,
     const std::string& password)
     : OneClickSigninInfoBarDelegate(owner),
       session_index_(session_index),
       email_(email),
       password_(password),
       button_pressed_(false) {
@@ skipping 577 matching lines @@
       if (source == SyncPromoUI::SOURCE_SETTINGS) {
         source_ = SyncPromoUI::SOURCE_SETTINGS;
         last_minute_source_change = true;
       }
     }
   }
 
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
   Profile* profile =
       Profile::FromBrowserContext(contents->GetBrowserContext());
-  InfoBarService* infobar_tab_helper =
-      InfoBarService::FromWebContents(contents);
 
   VLOG(1) << "OneClickSigninHelper::DidStopLoading: signin is go."
           << " auto_accept=" << auto_accept_
           << " source=" << source_;
 
   switch (auto_accept_) {
     case AUTO_ACCEPT_NONE:
       if (SyncPromoUI::UseWebBasedSigninFlow()) {
         UMA_HISTOGRAM_ENUMERATION("AutoLogin.Reverse",
                                   one_click_signin::HISTOGRAM_DISMISSED,
                                   one_click_signin::HISTOGRAM_MAX);
       } else {
-        infobar_tab_helper->AddInfoBar(
-            new OneClickInfoBarDelegateImpl(infobar_tab_helper, session_index_,
-                                            email_, password_));
+        OneClickInfoBarDelegateImpl::Create(
+            InfoBarService::FromWebContents(contents), session_index_, email_,
+            password_);
       }
       break;
     case AUTO_ACCEPT_ACCEPTED:
       SigninManager::DisableOneClickSignIn(profile);
       browser->window()->ShowOneClickSigninBubble(
           base::Bind(&StartSync, browser, auto_accept_, session_index_,
                      email_, password_));
       break;
     case AUTO_ACCEPT_CONFIGURE:
       SigninManager::DisableOneClickSignIn(profile);
@@ skipping 59 matching lines @@
         break;
     }
   }
 
   RedirectToNTP();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
   RedirectToNTP();
 }