Revert 141482 - Pepper Flash settings integration - camera and microphone.

chrome/browser/resources/options2/content_settings.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   /** @const */ var OptionsPage = options.OptionsPage;
 
   //////////////////////////////////////////////////////////////////////////////
   // ContentSettings class:
 
@@ skipping 68 matching lines @@
 
       if (cr.isChromeOS)
         UIAccountTweaks.applyGuestModeVisibility(document);
 
       // Cookies filter page ---------------------------------------------------
       $('show-cookies-button').onclick = function(event) {
         chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']);
         OptionsPage.navigateToPage('cookies');
       };
 
+      // Remove from DOM instead of hiding so :last-of-type applies the style
+      // correctly.
       var intentsSection = $('intents-section');
       if (!loadTimeData.getBoolean('enable_web_intents') && intentsSection)
         intentsSection.parentNode.removeChild(intentsSection);
 
       if (loadTimeData.getBoolean('enable_restore_session_state')) {
         this.sessionRestoreEnabled = true;
         this.updateSessionRestoreContentSettings();
       }
 
       $('content-settings-overlay-confirm').onclick =
           OptionsPage.closeOverlay.bind(OptionsPage);
-
-      $('pepper-flash-cameramic-section').style.display = 'none';
-      $('pepper-flash-cameramic-exceptions-div').style.display = 'none';
     },
 
     /**
      * Called when the value of the "On startup" setting changes.
      * @param {Event} event Change event.
      * @private
      */
     onSessionRestoreSelectedChanged: function(event) {
       if (!event.value || typeof event.value['value'] == 'undefined')
         return;
@@ skipping 108 matching lines @@
    *     a content exception setting.
    */
   ContentSettings.patternValidityCheckComplete =
       function(type, mode, pattern, valid) {
     var exceptionsList =
         document.querySelector('div[contentType=' + type + '] ' +
                                'list[mode=' + mode + ']');
     exceptionsList.patternValidityCheckComplete(pattern, valid);
   };
 
-  /**
-   * Enables the Pepper Flash camera and microphone settings.
-   * Please note that whether the settings are actually showed or not is also
-   * affected by the style class pepper-flash-settings.
-   */
-  ContentSettings.enablePepperFlashCameraMicSettings = function() {
-    $('pepper-flash-cameramic-section').style.display = '';
-    $('pepper-flash-cameramic-exceptions-div').style.display = '';
-  }
-
   // Export
   return {
     ContentSettings: ContentSettings
   };
 
 });