Split the Media settings UI into separate microphone and camera sections.

chrome/test/data/policy/policy_test_cases.json

Index: chrome/test/data/policy/policy_test_cases.json
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index e3d6a20daf701d860c7d78260c2a1050381ac432..526e90659d8e50be64596ee50c1ad9c1b021ddf8 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -1065,7 +1065,7 @@
     "test_policy": { "DefaultMediaStreamSetting": 2 },
     "pref_mappings": [
       { "pref": "profile.managed_default_content_settings.media_stream",
-        "indicator_selector": "[content-setting=media-stream]",
+        "indicator_selector": "[content-setting=media-stream-mic],[content-setting=media-stream-camera]",
         "indicator_tests": [
           { "policy": { "DefaultMediaStreamSetting": 2 },
             "value": "block"
@@ -1079,15 +1079,65 @@
 
     "note": "TODO(bartfab): Flag this with can_be_recommended when http://crbug.com/106682 is fixed."
   },
+  
+  "DefaultMediaStreamSetting.OverriddenByAudioCaptureAllowed": {

[msramek, 2015/07/16 20:02:57]

The DefaultMediaStreamSetting policy is deprecated, but I'm not sure if it's
left around for legacy reasons... I'll find out.

Nevertheless, content_settings::PolicyProvider currently handles it as the same
value applied to both camera and mic, so in the UI this works out of the box.

I added a test for whether disabling audio/video overrides potential
DefaultMediaStreamSetting=ASK (it should).

+    "os": ["win", "linux", "mac", "chromeos"],
+    "test_policy": { "DefaultMediaStreamSetting": 3,
+                     "AudioCaptureAllowed": false },
+    "pref_mappings": [
+      { "pref": "profile.managed_default_content_settings.media_stream",
+        "indicator_selector": "[content-setting=media-stream-mic]",
+        "indicator_tests": [
+          { "policy": { "AudioCaptureAllowed": false },
+            "value": "block"
+          },
+          { "policy": { "AudioCaptureAllowed": true,
+                        "DefaultMediaStreamSetting": 2 },
+            "value": "block"
+          },
+          { "policy": { "AudioCaptureAllowed": true,
+                        "DefaultMediaStreamSetting": 3 },
+            "value": "ask"
+          }
+        ]
+      }
+    ]
+  },
+  
+  "DefaultMediaStreamSetting.OverriddenByVideoCaptureAllowed": {
+    "os": ["win", "linux", "mac", "chromeos"],
+    "test_policy": { "DefaultMediaStreamSetting": 3,
+                     "VideoCaptureAllowed": false },
+    "pref_mappings": [
+      { "pref": "profile.managed_default_content_settings.media_stream",
+        "indicator_selector": "[content-setting=media-stream-camera]",
+        "indicator_tests": [
+          { "policy": { "VideoCaptureAllowed": false },
+            "value": "block"
+          },
+          { "policy": { "VideoCaptureAllowed": true,
+                        "DefaultMediaStreamSetting": 2 },
+            "value": "block"
+          },
+          { "policy": { "VideoCaptureAllowed": true,
+                        "DefaultMediaStreamSetting": 3 },
+            "value": "ask"
+          }
+        ]
+      }
+    ]
+  },
 
   "AudioCaptureAllowed": {
     "os": ["win", "linux", "mac", "chromeos"],
     "test_policy": { "AudioCaptureAllowed": false },
     "pref_mappings": [
       { "pref": "hardware.audio_capture_enabled",
-        "indicator_selector": "#media-indicator",
+        "indicator_selector": "[content-setting=media-stream-mic][value=block]",
         "indicator_tests": [
-          { "policy": { "AudioCaptureAllowed": false } }
+          { "policy": { "AudioCaptureAllowed": false },
+            "value": "block"
+          }
         ]
       }
     ]
@@ -1108,9 +1158,11 @@
     "test_policy": { "VideoCaptureAllowed": false },
     "pref_mappings": [
       { "pref": "hardware.video_capture_enabled",
-        "indicator_selector": "#media-indicator",
+        "indicator_selector": "[content-setting=media-stream-camera][value=block]",
         "indicator_tests": [
-          { "policy": { "VideoCaptureAllowed": false } }
+          { "policy": { "VideoCaptureAllowed": false },
+            "value": "block"
+          }
         ]
       }
     ]