Stop using the MEDIASTREAM content setting.

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 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/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
@@ skipping 347 matching lines @@
 }
 
 static void SetAllowLocationEnabled(JNIEnv* env, jobject obj, jboolean allow) {
   GetPrefService()->SetBoolean(prefs::kGeolocationEnabled, allow);
 }
 
 static void SetCameraMicEnabled(JNIEnv* env, jobject obj, jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
       GetOriginalProfile()->GetHostContentSettingsMap();
   host_content_settings_map->SetDefaultContentSetting(
-      CONTENT_SETTINGS_TYPE_MEDIASTREAM,
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+      allow ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
+  host_content_settings_map->SetDefaultContentSetting(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
       allow ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
 }
 
 static void SetPushNotificationsEnabled(JNIEnv* env,
                                         jobject obj,
                                         jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
       GetOriginalProfile()->GetHostContentSettingsMap();
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
@@ skipping 78 matching lines @@
 static void SetAllowPopupsEnabled(JNIEnv* env, jobject obj, jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =
       GetOriginalProfile()->GetHostContentSettingsMap();
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_POPUPS,
       allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
 }
 
 static jboolean GetCameraMicEnabled(JNIEnv* env, jobject obj) {
   PrefService* prefs = GetPrefService();
-  return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM) &&
+  return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) &&
+         GetBooleanForContentSetting(
+             CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) &&
          prefs->GetBoolean(prefs::kAudioCaptureAllowed) &&
          prefs->GetBoolean(prefs::kVideoCaptureAllowed);
 }
 
 static jboolean GetCameraMicUserModifiable(JNIEnv* env, jobject obj) {
   PrefService* prefs = GetPrefService();
-  return IsContentSettingUserModifiable(CONTENT_SETTINGS_TYPE_MEDIASTREAM) &&
+  return IsContentSettingUserModifiable(
+             CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) &&
+         IsContentSettingUserModifiable(
+             CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) &&
          prefs->IsUserModifiablePreference(prefs::kAudioCaptureAllowed) &&
          prefs->IsUserModifiablePreference(prefs::kVideoCaptureAllowed);
 }
 
 static jboolean GetCameraMicManagedByCustodian(JNIEnv* env, jobject obj) {
   PrefService* prefs = GetPrefService();
   if (prefs->IsPreferenceManagedByCustodian(prefs::kVideoCaptureAllowed))
     return true;
   if (prefs->IsPreferenceManagedByCustodian(prefs::kAudioCaptureAllowed))
     return true;
@@ skipping 241 matching lines @@
                                                                jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
       GetPrefService()->GetString(
           prefs::kSupervisedUserSecondCustodianProfileImageURL)).Release();
 }
 
 bool RegisterPrefServiceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }