Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/media/protected_media_identifier_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/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"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/chromium_application.h"
 #endif
 
 // static
-InfoBar* ProtectedMediaIdentifierInfoBarDelegate::Create(
+InfoBarDelegate* ProtectedMediaIdentifierInfoBarDelegate::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 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),
       contents_unique_id_(contents_unique_id),
       display_languages_(display_languages) {
 }
 
 ProtectedMediaIdentifierInfoBarDelegate::
     ~ProtectedMediaIdentifierInfoBarDelegate() {
 }
@@ skipping 65 matching lines @@
 
 bool ProtectedMediaIdentifierInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
 #if defined(OS_ANDROID)
   chrome::android::ChromiumApplication::OpenProtectedContentSettings();
 #else
   NOTIMPLEMENTED();
 #endif
   return false; // Do not dismiss the info bar.
 }