Revert 179093

chrome/browser/ui/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/ui/media_stream_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
-#include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 MediaStreamInfoBarDelegate::~MediaStreamInfoBarDelegate() {}
 
 // static
 bool MediaStreamInfoBarDelegate::Create(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  TabSpecificContentSettings* content_settings =
-      TabSpecificContentSettings::FromWebContents(web_contents);
+
   scoped_ptr<MediaStreamDevicesController> controller(
-      new MediaStreamDevicesController(profile, content_settings,
-                                       request, callback));
-  if (controller->DismissInfoBarAndTakeActionOnSettings())
-    return false;
+      new MediaStreamDevicesController(profile, request, callback));
+  if (!controller->DismissInfoBarAndTakeActionOnSettings()) {
+    InfoBarService* infobar_service =
+        InfoBarService::FromWebContents(web_contents);
+    InfoBarDelegate* old_infobar = NULL;
+    for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
+      old_infobar = infobar_service->GetInfoBarDelegateAt(i)->
+          AsMediaStreamInfoBarDelegate();
+      if (old_infobar)
+        break;
+    }
 
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  InfoBarDelegate* old_infobar = NULL;
-  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
-    old_infobar = infobar_service->GetInfoBarDelegateAt(i)->
-        AsMediaStreamInfoBarDelegate();
+    scoped_ptr<InfoBarDelegate> infobar(
+        new MediaStreamInfoBarDelegate(infobar_service, controller.release()));
     if (old_infobar)
-      break;
+      infobar_service->ReplaceInfoBar(old_infobar, infobar.Pass());
+    else
+      infobar_service->AddInfoBar(infobar.Pass());
+    return true;
   }
-  scoped_ptr<InfoBarDelegate> infobar(
-      new MediaStreamInfoBarDelegate(infobar_service, controller.release()));
-  if (old_infobar)
-    infobar_service->ReplaceInfoBar(old_infobar, infobar.Pass());
-  else
-    infobar_service->AddInfoBar(infobar.Pass());
-
-  return true;
+  return false;
 }
 
 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.
   controller_->Deny(false);
 }
 
 gfx::Image* MediaStreamInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
@@ skipping 55 matching lines @@
 }
 
 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
     InfoBarService* infobar_service,
     MediaStreamDevicesController* controller)
     : ConfirmInfoBarDelegate(infobar_service),
       controller_(controller) {
   DCHECK(controller_.get());
   DCHECK(controller_->has_audio() || controller_->has_video());
 }