Revert 238283 "Infobar system refactor."

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

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MIDI_PERMISSION_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_MEDIA_MIDI_PERMISSION_INFOBAR_DELEGATE_H_
 
 #include <string>
 
 #include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
 class PermissionQueueController;
 class InfoBarService;
 
 // TODO(toyoshim): Much more code can be shared with GeolocationInfoBarDelegate.
 // http://crbug.com/266743
 
 // MIDIPermissionInfoBarDelegates are created by the
 // ChromeMIDIPermissionContext to control the display and handling of MIDI
 // permission infobars to the user.
 class MIDIPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates a MIDI permission infobar and delegate and adds the infobar to
-  // |infobar_service|.  Returns the infobar if it was successfully added.
-  static InfoBar* Create(InfoBarService* infobar_service,
-                         PermissionQueueController* controller,
-                         const PermissionRequestID& id,
-                         const GURL& requesting_frame,
-                         const std::string& display_languages);
+  // Creates a MIDI permission infobar delegate and adds it to
+  // |infobar_service|. Returns the delegate if it was successfully added.
+  static InfoBarDelegate* Create(InfoBarService* infobar_service,
+                                 PermissionQueueController* controller,
+                                 const PermissionRequestID& id,
+                                 const GURL& requesting_frame,
+                                 const std::string& display_languages);
 
  private:
-  MIDIPermissionInfoBarDelegate(PermissionQueueController* controller,
+  MIDIPermissionInfoBarDelegate(InfoBarService* infobar_service,
+                                PermissionQueueController* controller,
                                 const PermissionRequestID& id,
                                 const GURL& requesting_frame,
                                 int contents_unique_id,
                                 const std::string& display_languages);
   virtual ~MIDIPermissionInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
   virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
@@ skipping 11 matching lines @@
   PermissionQueueController* controller_;
   const PermissionRequestID id_;
   GURL requesting_frame_;
   int contents_unique_id_;
   std::string display_languages_;
 
   DISALLOW_COPY_AND_ASSIGN(MIDIPermissionInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MIDI_PERMISSION_INFOBAR_DELEGATE_H_