Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/nacl_host/nacl_infobar_delegate.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/nacl_host/nacl_infobar_delegate.h"
 
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 
 // static
 void NaClInfoBarDelegate::Create(int render_process_id, int render_view_id) {
   content::RenderViewHost* rvh =
       content::RenderViewHost::FromID(render_process_id, render_view_id);
   if (!rvh)
     return;
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
   if (!web_contents)
     return;
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   if (infobar_service) {
-    infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-        scoped_ptr<ConfirmInfoBarDelegate>(new NaClInfoBarDelegate())));
+    infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+        new NaClInfoBarDelegate(infobar_service)));
   }
 }
 
-NaClInfoBarDelegate::NaClInfoBarDelegate() : ConfirmInfoBarDelegate() {
+NaClInfoBarDelegate::NaClInfoBarDelegate(InfoBarService* infobar_service)
+    : ConfirmInfoBarDelegate(infobar_service) {
 }
 
 NaClInfoBarDelegate::~NaClInfoBarDelegate() {
 }
 
 string16 NaClInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_NACL_APP_MISSING_ARCH_MESSAGE);
 }
 
 int NaClInfoBarDelegate::GetButtons() const {
   return BUTTON_NONE;
 }
 
 string16 NaClInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool NaClInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   web_contents()->OpenURL(content::OpenURLParams(
       GURL("https://support.google.com/chrome/?p=ib_nacl"), content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }