Stop using the MEDIASTREAM content setting.

chrome/browser/media/media_stream_devices_controller.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_devices_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 482 matching lines @@
                             kCancel, kPermissionActionsMax);
   Deny(false, content::MEDIA_DEVICE_PERMISSION_DISMISSED);
 }
 
 void MediaStreamDevicesController::RequestFinished() {
   delete this;
 }
 
 bool MediaStreamDevicesController::IsRequestAllowedByDefault() const {
   // The request from internal objects like chrome://URLs is always allowed.
-  if (CheckAllowAllMediaStreamContentForOrigin(profile_,
-                                               request_.security_origin)) {
+  if (CheckAllowAllMediaStreamContentForOrigin(
+          profile_, request_.security_origin,
+          CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) &&
+      CheckAllowAllMediaStreamContentForOrigin(
+          profile_, request_.security_origin,
+          CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)) {
     return true;
   }
 
   struct {
     bool has_capability;
     const char* policy_name;
     const char* list_policy_name;
     ContentSettingsType settings_type;
   } device_checks[] = {
     { IsDeviceAudioCaptureRequestedAndAllowed(), prefs::kAudioCaptureAllowed,
@@ skipping 64 matching lines @@
     } else {
       ++requested_devices;
     }
   }
 
   return requested_devices;
 }
 
 bool MediaStreamDevicesController::IsDefaultMediaAccessBlocked() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // TODO(markusheintz): Replace CONTENT_SETTINGS_TYPE_MEDIA_STREAM with the
-  // appropriate new CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC and
-  // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA.
-  ContentSetting current_setting =
-      profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
-          CONTENT_SETTINGS_TYPE_MEDIASTREAM, NULL);
-  return (current_setting == CONTENT_SETTING_BLOCK);
+  return (profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
+              CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, NULL)
+          == CONTENT_SETTING_BLOCK &&
+          profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
+              CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, NULL)
+          == CONTENT_SETTING_BLOCK);
 }
 
 bool MediaStreamDevicesController::IsSchemeSecure() const {
   return request_.security_origin.SchemeIsSecure() ||
       request_.security_origin.SchemeIs(extensions::kExtensionScheme);
 }
 
 void MediaStreamDevicesController::StorePermission(bool allowed) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ContentSettingsPattern primary_pattern =
@@ skipping 71 matching lines @@
 }
 
 bool MediaStreamDevicesController::IsCaptureDeviceRequestAllowed() const {
 #if defined(OS_ANDROID)
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }