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

chrome/browser/resources/options/content_settings_exceptions_area.js

Index: chrome/browser/resources/options/content_settings_exceptions_area.js
diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js
index dc4f56debfd97484631d5b9399df78f777d0ac50..08c2858e81c37dedbf70fed4676a209d89191a63 100644
--- a/chrome/browser/resources/options/content_settings_exceptions_area.js
+++ b/chrome/browser/resources/options/content_settings_exceptions_area.js
@@ -19,7 +19,8 @@ cr.define('options.contentSettings', function() {
     return !(contentType == 'notifications' ||
              contentType == 'location' ||
              contentType == 'fullscreen' ||
-             contentType == 'media-stream' ||
+             contentType == 'media-stream-mic' ||
+             contentType == 'media-stream-camera' ||
              contentType == 'midi-sysex' ||
              contentType == 'zoomlevels');
   }
@@ -126,17 +127,6 @@ cr.define('options.contentSettings', function() {
       if (this.pattern)
         select.setAttribute('displaymode', 'edit');
 
-      if (this.contentType == 'media-stream') {
-        this.settingLabel.classList.add('media-audio-setting');
-
-        var videoSettingLabel = cr.doc.createElement('span');
-        videoSettingLabel.textContent = this.videoSettingForDisplay();
-        videoSettingLabel.className = 'exception-setting';
-        videoSettingLabel.classList.add('media-video-setting');
-        videoSettingLabel.setAttribute('displaymode', 'static');
-        this.contentElement.appendChild(videoSettingLabel);
-      }
-
       if (this.contentType == 'zoomlevels') {
         this.deletable = true;
 
@@ -264,16 +254,6 @@ cr.define('options.contentSettings', function() {
     },
 
     /**
-     * media video specific function.
-     * Gets a human-readable video setting string.
-     *
-     * @return {string} The display string.
-     */
-    videoSettingForDisplay: function() {
-      return this.getDisplayStringForSetting(this.dataItem.video);
-    },
-
-    /**
      * Gets a human-readable display string for setting.
      *
      * @param {string} setting The setting to be displayed.
@@ -640,9 +620,6 @@ cr.define('options.contentSettings', function() {
           divs[i].hidden = true;
       }
 
-      var mediaHeader = this.pageDiv.querySelector('.media-header');
-      mediaHeader.hidden = type != 'media-stream';
-
       $('exception-behavior-column').hidden = type == 'zoomlevels';
       $('exception-zoom-column').hidden = type != 'zoomlevels';
     },