Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/media/protected_media_identifier_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_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_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
 
 class ProtectedMediaIdentifierInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates a protected media identifier 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 protected media identifier 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);
  protected:
-  ProtectedMediaIdentifierInfoBarDelegate(PermissionQueueController* controller,
+  ProtectedMediaIdentifierInfoBarDelegate(InfoBarService* infobar_service,
+                                          PermissionQueueController* controller,
                                           const PermissionRequestID& id,
                                           const GURL& requesting_frame,
                                           int contents_unique_id,
                                           const std::string& display_languages);
   virtual ~ProtectedMediaIdentifierInfoBarDelegate();
 
   // Calls back to the controller to inform it of the user's decision.
   void SetPermission(bool update_content_setting, bool allowed);
 
  private:
@@ skipping 13 matching lines @@
   PermissionQueueController* controller_;
   const PermissionRequestID id_;
   GURL requesting_frame_;
   int contents_unique_id_;
   std::string display_languages_;
 
   DISALLOW_COPY_AND_ASSIGN(ProtectedMediaIdentifierInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_DELEGATE_H_