Split Camera and Mic into two permissions on the Site Details page (under Site Settings).

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
index 7eda61b056776b01aa16e5ca8337f60813140d26..06c96637692c419e42bbb1d23d98da9ba1638bf3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
@@ -25,11 +25,12 @@ public class ContentPreferences extends PreferenceFragment
         implements OnPreferenceClickListener {
     // The keys for each category shown on the Site Settings page.
     static final String ALL_SITES_KEY = "website_settings";
+    static final String CAMERA_KEY = "camera";
     static final String COOKIES_KEY = "cookies";
     static final String FULLSCREEN_KEY = "fullscreen";
     static final String IMAGES_KEY = "images";
     static final String LOCATION_KEY = "device_location";
-    static final String CAMERA_AND_MIC_KEY = "use_camera_or_mic";
+    static final String MICROPHONE_KEY = "microphone";
     static final String JAVASCRIPT_KEY = "javascript";
     static final String BLOCK_POPUPS_KEY = "block_popups";
     static final String PUSH_NOTIFICATIONS_KEY = "push_notifications";
@@ -52,14 +53,16 @@ public class ContentPreferences extends PreferenceFragment
     }
 
     private int keyToContentSettingsType(String key) {
-        if (COOKIES_KEY.equals(key)) {
+        if (CAMERA_KEY.equals(key)) {
+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
+        } else if (COOKIES_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES;
         } else if (FULLSCREEN_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN;
         } else if (LOCATION_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;
-        } else if (CAMERA_AND_MIC_KEY.equals(key)) {
-            return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM;
+        } else if (MICROPHONE_KEY.equals(key)) {
+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
         } else if (IMAGES_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES;
         } else if (JAVASCRIPT_KEY.equals(key)) {
@@ -90,10 +93,11 @@ public class ContentPreferences extends PreferenceFragment
             websitePrefs.add(PROTECTED_CONTENT_KEY);
         }
         websitePrefs.add(COOKIES_KEY);
-        websitePrefs.add(CAMERA_AND_MIC_KEY);
+        websitePrefs.add(CAMERA_KEY);
         websitePrefs.add(FULLSCREEN_KEY);
         websitePrefs.add(IMAGES_KEY);
         websitePrefs.add(JAVASCRIPT_KEY);
+        websitePrefs.add(MICROPHONE_KEY);
         websitePrefs.add(PUSH_NOTIFICATIONS_KEY);
         websitePrefs.add(POPUPS_KEY);
         // Initialize the summary and icon for all preferences that have an
@@ -103,12 +107,14 @@ public class ContentPreferences extends PreferenceFragment
             boolean checked = false;
             if (LOCATION_KEY.equals(prefName)) {
                 checked = LocationSettings.getInstance().areAllLocationSettingsEnabled();
-            } else if (CAMERA_AND_MIC_KEY.equals(prefName)) {
-                checked = PrefServiceBridge.getInstance().isCameraMicEnabled();
+            } else if (CAMERA_KEY.equals(prefName)) {
+                checked = PrefServiceBridge.getInstance().isCameraEnabled();
             } else if (JAVASCRIPT_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().javaScriptEnabled();
             } else if (IMAGES_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().imagesEnabled();
+            } else if (MICROPHONE_KEY.equals(prefName)) {
+                checked = PrefServiceBridge.getInstance().isMicEnabled();
             } else if (PROTECTED_CONTENT_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().isProtectedMediaIdentifierEnabled();
             } else if (COOKIES_KEY.equals(prefName)) {