Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/media/protected_media_identifier_infobar_delegate.cc

Index: trunk/src/chrome/browser/media/protected_media_identifier_infobar_delegate.cc
===================================================================
--- trunk/src/chrome/browser/media/protected_media_identifier_infobar_delegate.cc	(revision 238401)
+++ trunk/src/chrome/browser/media/protected_media_identifier_infobar_delegate.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "chrome/browser/media/protected_media_identifier_infobar_delegate.h"
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "grit/generated_resources.h"
@@ -18,7 +17,7 @@
 #endif
 
 // static
-InfoBar* ProtectedMediaIdentifierInfoBarDelegate::Create(
+InfoBarDelegate* ProtectedMediaIdentifierInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
@@ -26,23 +25,23 @@
     const std::string& display_languages) {
   const content::NavigationEntry* committed_entry =
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
-  return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new ProtectedMediaIdentifierInfoBarDelegate(
-              controller, id, requesting_frame,
-              committed_entry ? committed_entry->GetUniqueID() : 0,
-              display_languages))));
+  return infobar_service->AddInfoBar(
+      scoped_ptr<InfoBarDelegate>(new ProtectedMediaIdentifierInfoBarDelegate(
+          infobar_service, controller, id, requesting_frame,
+          committed_entry ? committed_entry->GetUniqueID() : 0,
+          display_languages)));
 }
 
 
 ProtectedMediaIdentifierInfoBarDelegate::
     ProtectedMediaIdentifierInfoBarDelegate(
-    PermissionQueueController* controller,
-    const PermissionRequestID& id,
-    const GURL& requesting_frame,
-    int contents_unique_id,
-    const std::string& display_languages)
-    : ConfirmInfoBarDelegate(),
+        InfoBarService* infobar_service,
+        PermissionQueueController* controller,
+        const PermissionRequestID& id,
+        const GURL& requesting_frame,
+        int contents_unique_id,
+        const std::string& display_languages)
+    : ConfirmInfoBarDelegate(infobar_service),
       controller_(controller),
       id_(id),
       requesting_frame_(requesting_frame),