Stop using the MEDIASTREAM content setting.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 60 matching lines @@
     ContentSetting flash_default_setting;
     MediaExceptions flash_exceptions;
     bool flash_settings_initialized;
     uint32_t last_flash_refresh_request_id;
 
     // Whether the links to Flash settings pages are showed.
     bool show_flash_default_link;
     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;
   };
 
   // Used by ShowFlashMediaLink() to specify which link to show/hide.
   enum LinkType {
     DEFAULT_SETTING = 0,
     EXCEPTIONS,
   };
 
@@ skipping 138 matching lines @@
   scoped_ptr<content::HostZoomMap::Subscription>
       signin_host_zoom_map_subscription_;
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_