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

chrome/browser/resources/options2/content_settings.js

Index: chrome/browser/resources/options2/content_settings.js
===================================================================
--- chrome/browser/resources/options2/content_settings.js	(revision 141490)
+++ chrome/browser/resources/options2/content_settings.js	(working copy)
@@ -86,6 +86,8 @@
         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);
@@ -97,9 +99,6 @@
 
       $('content-settings-overlay-confirm').onclick =
           OptionsPage.closeOverlay.bind(OptionsPage);
-
-      $('pepper-flash-cameramic-section').style.display = 'none';
-      $('pepper-flash-cameramic-exceptions-div').style.display = 'none';
     },
 
     /**
@@ -228,16 +227,6 @@
     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