Stop using the MEDIASTREAM content setting.

chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 
@@ skipping 78 matching lines @@
 
 // static
 void PepperFlashContentSettingsUtils::SortMediaExceptions(
     MediaExceptions* media_exceptions) {
   std::sort(media_exceptions->begin(), media_exceptions->end(),
             MediaExceptionSortFunc);
 }
 
 // static
 bool PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
-    ContentSetting default_setting_1,
+    ContentSetting default_audio_setting_1,
+    ContentSetting default_video_setting_1,
     const MediaExceptions& exceptions_1,
-    ContentSetting default_setting_2,
+    ContentSetting default_audio_setting_2,
+    ContentSetting default_video_setting_2,
     const MediaExceptions& exceptions_2,
     bool ignore_audio_setting,
     bool ignore_video_setting) {
   MediaExceptions::const_iterator iter_1 = exceptions_1.begin();
   MediaExceptions::const_iterator iter_2 = exceptions_2.begin();
 
   MediaException default_exception_1(ContentSettingsPattern(),
-                                     default_setting_1,
-                                     default_setting_1);
+                                     default_audio_setting_1,
+                                     default_video_setting_1);
   MediaException default_exception_2(ContentSettingsPattern(),
-                                     default_setting_2,
-                                     default_setting_2);
+                                     default_audio_setting_2,
+                                     default_video_setting_2);
 
   while (iter_1 != exceptions_1.end() && iter_2 != exceptions_2.end()) {
     int compare_result = CompareMediaException(*iter_1, *iter_2);
     if (compare_result < 0) {
       if (!AreSettingsEqualOrIgnored(*iter_1, default_exception_2,
                                      ignore_audio_setting,
                                      ignore_video_setting)) {
         return false;
       }
       ++iter_1;
@@ skipping 27 matching lines @@
                                    ignore_audio_setting,
                                    ignore_video_setting)) {
       return false;
     }
     ++iter_2;
   }
   return true;
 }
 
 }  // namespace options