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

chrome/browser/managed_mode/managed_mode_navigation_observer.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/managed_mode/managed_mode_navigation_observer.h"
 
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 class ManagedModeWarningInfobarDelegate : public ConfirmInfoBarDelegate {
  public:
-  explicit ManagedModeWarningInfobarDelegate(InfoBarService* infobar_service);
+  // Creates a managed mode warning delegate and adds it to |infobar_service|.
+  // Returns the delegate if it was successfully added.
+  static InfoBarDelegate* Create(InfoBarService* infobar_service);
 
  private:
+  explicit ManagedModeWarningInfobarDelegate(InfoBarService* infobar_service);
   virtual ~ManagedModeWarningInfobarDelegate();
 
   // ConfirmInfoBarDelegate overrides:
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
   // InfoBarDelegate override:
@@ skipping 19 matching lines @@
   if (BrowserList::size() == 1) {
     Browser* browser = *(BrowserList::begin());
     DCHECK(browser == chrome::FindBrowserWithWebContents(web_contents));
     if (browser->tab_count() == 1)
       chrome::NewEmptyWindow(browser->profile());
   }
 
   web_contents->GetDelegate()->CloseContents(web_contents);
 }
 
+// static
+InfoBarDelegate* ManagedModeWarningInfobarDelegate::Create(
+    InfoBarService* infobar_service) {
+  return infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new ManagedModeWarningInfobarDelegate(infobar_service)));
+}
+
 ManagedModeWarningInfobarDelegate::ManagedModeWarningInfobarDelegate(
     InfoBarService* infobar_service)
     : ConfirmInfoBarDelegate(infobar_service) {}
 
 ManagedModeWarningInfobarDelegate::~ManagedModeWarningInfobarDelegate() {}
 
 string16 ManagedModeWarningInfobarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_MANAGED_MODE_WARNING_MESSAGE);
 }
 
@@ skipping 54 matching lines @@
     content::PageTransition transition_type,
     content::RenderViewHost* render_view_host) {
   if (!is_main_frame)
     return;
 
   ManagedModeURLFilter::FilteringBehavior behavior =
       url_filter_->GetFilteringBehaviorForURL(url);
 
   if (behavior == ManagedModeURLFilter::WARN) {
     if (!warn_infobar_delegate_) {
-      InfoBarService* infobar_service =
-          InfoBarService::FromWebContents(web_contents());
-      warn_infobar_delegate_ =
-          new ManagedModeWarningInfobarDelegate(infobar_service);
-      infobar_service->AddInfoBar(warn_infobar_delegate_);
+      warn_infobar_delegate_ = ManagedModeWarningInfobarDelegate::Create(
+          InfoBarService::FromWebContents(web_contents()));
     }
   } else {
     if (warn_infobar_delegate_) {
       InfoBarService* infobar_service =
           InfoBarService::FromWebContents(web_contents());
       infobar_service->RemoveInfoBar(warn_infobar_delegate_);
       warn_infobar_delegate_= NULL;
     }
   }
 
 }