Infobar Componentization Proof of Concept

chrome/browser/media/midi_permission_infobar_delegate.cc

Index: chrome/browser/media/midi_permission_infobar_delegate.cc
diff --git a/chrome/browser/media/midi_permission_infobar_delegate.cc b/chrome/browser/media/midi_permission_infobar_delegate.cc
index bc10f8d410194e10dbeb81d038ccdaa02d2d8bbe..1d46c7369b0ad2335bdfb3ec4c4f5eda88a97d12 100644
--- a/chrome/browser/media/midi_permission_infobar_delegate.cc
+++ b/chrome/browser/media/midi_permission_infobar_delegate.cc
@@ -28,24 +28,27 @@ InfoBar* MidiPermissionInfoBarDelegate::Create(
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
   return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate(
-          controller, id, requesting_frame,
+          infobar_service->web_contents(),
+          controller,
+          id,
+          requesting_frame,
           committed_entry ? committed_entry->GetUniqueID() : 0,
           display_languages))));
 }
 
 MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate(
+    content::WebContents* web_contents,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
     const std::string& display_languages)
-    : ConfirmInfoBarDelegate(),
+    : ContentConfirmInfoBarDelegate(web_contents),
       controller_(controller),
       id_(id),
       requesting_frame_(requesting_frame),
       contents_unique_id_(contents_unique_id),
-      display_languages_(display_languages) {
-}
+      display_languages_(display_languages) {}
 
 MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() {
 }
@@ -63,14 +66,11 @@ InfoBarDelegate::Type MidiPermissionInfoBarDelegate::GetInfoBarType() const {
 }
 
 bool MidiPermissionInfoBarDelegate::ShouldExpireInternal(
-    const content::LoadCommittedDetails& details) const {
+    const NavigationDetails& details) const {
   // This implementation matches InfoBarDelegate::ShouldExpireInternal(), but
   // uses the unique ID we set in the constructor instead of that stored in the
   // base class.
-  return (contents_unique_id_ != details.entry->GetUniqueID()) ||
-      (content::PageTransitionStripQualifier(
-          details.entry->GetTransitionType()) ==
-              content::PAGE_TRANSITION_RELOAD);
+  return (contents_unique_id_ != details.entry_id) || details.is_reload;
 }
 
 base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const {