Revert 238283 "Infobar system refactor."

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

 // Copyright (c) 2012 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/media_stream_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
@@ skipping 22 matching lines @@
 
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   if (!infobar_service) {
     // Deny the request if there is no place to show the infobar, e.g. when
     // the request comes from a background extension page.
     controller->Deny(false);
     return false;
   }
 
-  scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new MediaStreamInfoBarDelegate(controller.Pass()))));
+  scoped_ptr<InfoBarDelegate> infobar(
+      new MediaStreamInfoBarDelegate(infobar_service, controller.Pass()));
   for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
-    InfoBar* old_infobar = infobar_service->infobar_at(i);
-    if (old_infobar->delegate()->AsMediaStreamInfoBarDelegate()) {
+    InfoBarDelegate* old_infobar =
+        infobar_service->infobar_at(i)->AsMediaStreamInfoBarDelegate();
+    if (old_infobar) {
       infobar_service->ReplaceInfoBar(old_infobar, infobar.Pass());
       return true;
     }
   }
   infobar_service->AddInfoBar(infobar.Pass());
   return true;
 }
 
 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
+    InfoBarService* infobar_service,
     scoped_ptr<MediaStreamDevicesController> controller)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       controller_(controller.Pass()) {
   DCHECK(controller_.get());
   DCHECK(controller_->HasAudio() || controller_->HasVideo());
 }
 
 void MediaStreamInfoBarDelegate::InfoBarDismissed() {
   // Deny the request if the infobar was closed with the 'x' button, since
   // we don't want WebRTC to be waiting for an answer that will never come.
   UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
                             kCancel, kPermissionActionsMax);
@@ skipping 59 matching lines @@
   web_contents()->OpenURL(content::OpenURLParams(
       google_util::AppendGoogleLocaleParam(
           GURL(chrome::kMediaAccessLearnMoreUrl)),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK,
       false));
 
   return false;  // Do not dismiss the info bar.
 }