Revert 238283 "Infobar system refactor."

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

 // Copyright 2013 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/media/midi_permission_infobar_delegate.h"
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/content_settings/permission_request_id.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
-InfoBar* MIDIPermissionInfoBarDelegate::Create(
+InfoBarDelegate* MIDIPermissionInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     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 MIDIPermissionInfoBarDelegate(
-          controller, id, requesting_frame,
+  return infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new MIDIPermissionInfoBarDelegate(
+          infobar_service, controller, id, requesting_frame,
           committed_entry ? committed_entry->GetUniqueID() : 0,
-          display_languages))));
+          display_languages)));
 }
 
 MIDIPermissionInfoBarDelegate::MIDIPermissionInfoBarDelegate(
+    InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
     const std::string& display_languages)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       controller_(controller),
       id_(id),
       requesting_frame_(requesting_frame),
       contents_unique_id_(contents_unique_id),
       display_languages_(display_languages) {
 }
 
 MIDIPermissionInfoBarDelegate::~MIDIPermissionInfoBarDelegate() {
 }
 
@@ skipping 40 matching lines @@
 bool MIDIPermissionInfoBarDelegate::Cancel() {
   SetPermission(true, false);
   return true;
 }
 
 void MIDIPermissionInfoBarDelegate::SetPermission(bool update_content_setting,
                                                   bool allowed) {
   controller_->OnPermissionSet(id_, requesting_frame_, web_contents()->GetURL(),
                                update_content_setting, allowed);
 }