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

chrome/browser/ui/hung_plugin_tab_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/hung_plugin_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/process_util.h"
@@ skipping 106 matching lines @@
     ++iter;
   }
   // Ignore the case where we didn't find the plugin, it may have terminated
   // before this function could run.
 }
 
 }  // namespace
 
 class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  HungPluginInfoBarDelegate(HungPluginTabHelper* helper,
-                            InfoBarService* infobar_service,
-                            int plugin_child_id,
-                            const string16& plugin_name);
-  virtual ~HungPluginInfoBarDelegate();
+  // Creates a hung plugin delegate and adds it to |infobar_service|.  Returns
+  // the delegate if it was successfully added.
+  static HungPluginInfoBarDelegate* Create(InfoBarService* infobar_service,
+                                           HungPluginTabHelper* helper,
+                                           int plugin_child_id,
+                                           const string16& plugin_name);
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
  private:
+  HungPluginInfoBarDelegate(HungPluginTabHelper* helper,
+                            InfoBarService* infobar_service,
+                            int plugin_child_id,
+                            const string16& plugin_name);
+  virtual ~HungPluginInfoBarDelegate();
+
   HungPluginTabHelper* helper_;
   int plugin_child_id_;
 
   string16 message_;
   string16 button_text_;
   gfx::Image* icon_;
 };
 
+// static
+HungPluginInfoBarDelegate* HungPluginInfoBarDelegate::Create(
+    InfoBarService* infobar_service,
+    HungPluginTabHelper* helper,
+    int plugin_child_id,
+    const string16& plugin_name) {
+  return static_cast<HungPluginInfoBarDelegate*>(infobar_service->AddInfoBar(
+      scoped_ptr<InfoBarDelegate>(new HungPluginInfoBarDelegate(
+          helper, infobar_service, plugin_child_id, plugin_name))));
+}
+
 HungPluginInfoBarDelegate::HungPluginInfoBarDelegate(
     HungPluginTabHelper* helper,
     InfoBarService* infobar_service,
     int plugin_child_id,
     const string16& plugin_name)
     : ConfirmInfoBarDelegate(infobar_service),
       helper_(helper),
       plugin_child_id_(plugin_child_id) {
   message_ = l10n_util::GetStringFUTF16(IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR,
                                         plugin_name);
@@ skipping 196 matching lines @@
   ShowBar(child_id, found->second.get());
 }
 
 void HungPluginTabHelper::ShowBar(int child_id, PluginState* state) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (!infobar_service)
     return;
 
   DCHECK(!state->info_bar);
-  state->info_bar = new HungPluginInfoBarDelegate(this, infobar_service,
-                                                  child_id, state->name);
-  infobar_service->AddInfoBar(state->info_bar);
+  state->info_bar =
+      HungPluginInfoBarDelegate::Create(infobar_service, this, child_id,
+                                        state->name);
 }
 
 void HungPluginTabHelper::CloseBar(PluginState* state) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (!infobar_service)
     return;
 
   if (state->info_bar) {
     infobar_service->RemoveInfoBar(state->info_bar);
     state->info_bar = NULL;
   }
 }