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

chrome/browser/infobars/insecure_content_infobar_delegate.cc

 // Copyright (c) 2011 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/infobars/insecure_content_infobar_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::OpenURLParams;
 
+// static
+void InsecureContentInfoBarDelegate::Create(InfoBarService* infobar_service,
+                                            InfoBarType type) {
+  scoped_ptr<InfoBarDelegate> new_infobar(
+      new InsecureContentInfoBarDelegate(infobar_service, type));
+
+  // Only supsersede an existing insecure content infobar if we are upgrading
+  // from DISPLAY to RUN.
+  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
+    InsecureContentInfoBarDelegate* delegate = infobar_service->
+        GetInfoBarDelegateAt(i)->AsInsecureContentInfoBarDelegate();
+    if (delegate != NULL) {
+      if ((type == RUN) && (delegate->type_ == DISPLAY))
+        return;
+      infobar_service->ReplaceInfoBar(delegate, new_infobar.Pass());
+      break;
+    }
+  }
+  if (new_infobar.get())
+    infobar_service->AddInfoBar(new_infobar.Pass());
+
+  UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2",
+      (type == DISPLAY) ? DISPLAY_INFOBAR_SHOWN : RUN_INFOBAR_SHOWN,
+      NUM_EVENTS);
+}
+
 InsecureContentInfoBarDelegate::InsecureContentInfoBarDelegate(
     InfoBarService* infobar_service,
     InfoBarType type)
     : ConfirmInfoBarDelegate(infobar_service),
       type_(type) {
-  UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2",
-      (type_ == DISPLAY) ? DISPLAY_INFOBAR_SHOWN : RUN_INFOBAR_SHOWN,
-      NUM_EVENTS);
 }
 
 InsecureContentInfoBarDelegate::~InsecureContentInfoBarDelegate() {
 }
 
 void InsecureContentInfoBarDelegate::InfoBarDismissed() {
   UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2",
       (type_ == DISPLAY) ? DISPLAY_INFOBAR_DISMISSED : RUN_INFOBAR_DISMISSED,
       NUM_EVENTS);
   ConfirmInfoBarDelegate::InfoBarDismissed();
@@ skipping 51 matching lines @@
 bool InsecureContentInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   owner()->GetWebContents()->OpenURL(OpenURLParams(
       google_util::AppendGoogleLocaleParam(GURL(
       "https://www.google.com/support/chrome/bin/answer.py?answer=1342714")),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }