Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/nacl_host/nacl_infobar_delegate.cc

Index: trunk/src/chrome/browser/nacl_host/nacl_infobar_delegate.cc
===================================================================
--- trunk/src/chrome/browser/nacl_host/nacl_infobar_delegate.cc	(revision 238401)
+++ trunk/src/chrome/browser/nacl_host/nacl_infobar_delegate.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #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"
@@ -26,12 +25,13 @@
   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() {