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/Website.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
index ab0045984bdb12551a6972b7299aa5fd3b0e7506..1c30a4590bf3abaf5552d5e0dcf10542ae4bd605 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
@@ -326,31 +326,25 @@ public class Website implements Serializable {
     public int getMediaAccessType() {
         ContentSetting voice = getVoiceCapturePermission();
         ContentSetting video = getVideoCapturePermission();
-        if (video != null) {
-            if (voice == null) {
-                if (video == ContentSetting.ALLOW) {
-                    return CAMERA_ACCESS_ALLOWED;
-                } else {
-                    return CAMERA_ACCESS_DENIED;
-                }
-            } else {
-                if (video != voice) {
-                    return INVALID_CAMERA_OR_MICROPHONE_ACCESS;
-                }
-                if (video == ContentSetting.ALLOW && voice == ContentSetting.ALLOW) {
-                    return MICROPHONE_AND_CAMERA_ACCESS_ALLOWED;
-                } else {
-                    return MICROPHONE_AND_CAMERA_ACCESS_DENIED;
-                }
-            }
-        } else {
-            if (voice == null) return INVALID_CAMERA_OR_MICROPHONE_ACCESS;
-            if (voice == ContentSetting.ALLOW) {
-                return MICROPHONE_ACCESS_ALLOWED;
-            } else {
-                return MICROPHONE_ACCESS_DENIED;
-            }
+        if (video == ContentSetting.ALLOW && voice == ContentSetting.ALLOW) {
+            return MICROPHONE_AND_CAMERA_ACCESS_ALLOWED;
+        }
+        if (video == ContentSetting.BLOCK && voice == ContentSetting.BLOCK) {
+            return MICROPHONE_AND_CAMERA_ACCESS_DENIED;
+        }
+        if (video == ContentSetting.ALLOW) {
+            return CAMERA_ACCESS_ALLOWED;
+        }
+        if (voice == ContentSetting.ALLOW) {
+            return MICROPHONE_ACCESS_ALLOWED;
+        }
+        if (video == ContentSetting.BLOCK) {
+            return CAMERA_ACCESS_DENIED;
+        }
+        if (voice == ContentSetting.BLOCK) {
+            return MICROPHONE_ACCESS_DENIED;
         }
+        return INVALID_CAMERA_OR_MICROPHONE_ACCESS;

[newt (away), 2015/04/16 17:11:20]

as soon as we allow users to toggle these individually, we'll run into
situations where one is "BLOCK" and the other is "ALLOW", in which case this
method will return INVALID_CAMERA_OR_MICROPHONE_ACCESS.

What's the plan here? If we're splitting up camera and mic into two separate
permissions, seems like we should do it fully: i.e. split the "camera or
microphone" site settings page into two pages.

[Finnur, 2015/04/22 16:01:38]

No, lines 335 through 346 handle the case where only one permission is set and
we just report the one that is allowed.
Line 347 is just a catch-all if neither is set.

But thinking about this some more, now that we've fully separated the categories
there's no need for this function or the icon we show in the WebsitePreferences
page. We've removed all other explanatory icons and it is time to do the same
here.

     }
 
     public void setLocalStorageInfo(LocalStorageInfo info) {