Stop using the MEDIASTREAM content setting.

chrome/browser/ui/webui/options/content_settings_handler.h

Index: chrome/browser/ui/webui/options/content_settings_handler.h
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h
index 2abb4d1f78fcc7c9bb56a76cbcbcf96221b3c6db..7ae81cb30b015f6d407d9b049f40a9468a8bc0fa 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -78,10 +78,11 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
     bool show_flash_exceptions_link;
 
     // Cached Chrome media settings.
-    ContentSetting default_setting;
+    ContentSetting default_audio_setting;
+    ContentSetting default_video_setting;
     bool policy_disable_audio;
     bool policy_disable_video;
-    bool default_setting_initialized;
+    bool default_settings_initialized;
     MediaExceptions exceptions;
     bool exceptions_initialized;
   };