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

chrome/test/data/policy/policy_test_cases.json

 {
   "-- Template --": {
     "intro": "Top-level entries map a policy name to its test parameters, described below. The name of the top level entry should be of the form <policy name>[.suffix]. The optional suffix is used for defining multiple test cases for a single policy.",
 
     "os": ["List of operating systems that support this policy. Valid values:", "win", "linux", "mac", "chromeos", "Defaults to empty if not specified."],
     "official_only": "Whether this policy exists in official builds only. Defaults to |false| if not specified.",
     "can_be_recommended": "Whether a recommended value may be set for the policy. Defaults to |false| if not specified.",
     "test_policy": "A policy dictionary that should make the preferences affected by this policy become policy-controlled. Usually just sets the current policy. Defaults to an empty dictionary if not specified.",
     "note": "If the policy affects any preferences, the following array should be specified with one entry per such preference.",
     "pref_mappings": [
@@ skipping 1047 matching lines @@
     ],
 
     "note": "TODO(bartfab): Flag this with can_be_recommended when http://crbug.com/106682 is fixed."
   },
 
   "DefaultMediaStreamSetting": {
     "os": ["win", "linux", "mac", "chromeos"],
     "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"
           },
           { "policy": { "DefaultMediaStreamSetting": 3 },
             "value": "ask"
           }
         ]
       }
     ],
 
     "note": "TODO(bartfab): Flag this with can_be_recommended when http://crbug.com/106682 is fixed."
   },
+  
+  "DefaultMediaStreamSetting.OverriddenByAudioCaptureAllowed": {
+    "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"
+          }
         ]
       }
     ]
   },
 
   "AudioCaptureAllowedUrls": {
     "os": ["win", "linux", "mac", "chromeos"],
     "test_policy": { "AudioCaptureAllowedUrls": ["[*.]google.com"] },
     "pref_mappings": [
       {
         "pref": "hardware.audio_capture_allowed_urls"
       }
     ]
   },
 
   "VideoCaptureAllowed": {
     "os": ["win", "linux", "mac", "chromeos"],
     "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"
+          }
         ]
       }
     ]
   },
 
   "VideoCaptureAllowedUrls": {
     "os": ["win", "linux", "mac", "chromeos"],
     "test_policy": { "VideoCaptureAllowedUrls": ["[*.]google.com"] },
     "pref_mappings": [
       {
@@ skipping 1369 matching lines @@
 
   "AdditionalLaunchParameters": {
   },
 
   "SuppressChromeFrameTurndownPrompt": {
   },
 
   "SkipMetadataCheck": {
   }
 }