Stop using the MEDIASTREAM content setting.

chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.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 "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using options::MediaException;
@@ skipping 50 matching lines @@
   EXPECT_EQ(list_2, list_3);
 }
 
 TEST(PepperFlashContentSettingsUtilsTest, AreMediaExceptionsEqual) {
   {
     // Empty lists are equal.
     // Default settings are not compared directly, so it is possible to return
     // true when they are different.
     EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_BLOCK,
+        CONTENT_SETTING_ASK,
         MediaExceptions(),
+        CONTENT_SETTING_BLOCK,
         CONTENT_SETTING_ASK,
         MediaExceptions(),
         false,
         false));
   }
 
   {
     MediaException exceptions_1[] = {
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW),
       MediaException(ContentSettingsPattern::FromString("www.youtube.com"),
                      CONTENT_SETTING_ASK, CONTENT_SETTING_ASK)
     };
 
     MediaException exceptions_2[] = {
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
     // The exception of "www.youtube.com" in |exceptions_1| should not affect
     // the result, because it has the same settings as |default_setting_2|.
     EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ALLOW,
+        CONTENT_SETTING_ALLOW,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         false,
         false));
     EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         CONTENT_SETTING_ALLOW,
+        CONTENT_SETTING_ALLOW,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         false,
         false));
     // Changing |default_setting_2| should change the result.
     EXPECT_FALSE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ALLOW,
+        CONTENT_SETTING_ALLOW,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ALLOW,
+        CONTENT_SETTING_ALLOW,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         false,
         false));
   }
 
   {
     // Similar to the previous block, but reoder the exceptions. The outcome
     // should be the same.
     MediaException exceptions_1[] = {
       MediaException(ContentSettingsPattern::FromString("www.youtube.com"),
                      CONTENT_SETTING_ASK, CONTENT_SETTING_ASK),
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
     MediaException exceptions_2[] = {
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
     EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ALLOW,
+        CONTENT_SETTING_ALLOW,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         false,
         false));
     EXPECT_FALSE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ALLOW,
+        CONTENT_SETTING_ALLOW,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ALLOW,
+        CONTENT_SETTING_ALLOW,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         false,
         false));
   }
 
   {
     MediaException exceptions_1[] = {
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK)
     };
 
     MediaException exceptions_2[] = {
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
     // Test that |ignore_video_setting| works.
     EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_BLOCK,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         false,
         true));
     EXPECT_FALSE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         false,
         false));
   }
 
   {
     MediaException exceptions_1[] = {
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_BLOCK, CONTENT_SETTING_ALLOW)
     };
 
     MediaException exceptions_2[] = {
       MediaException(ContentSettingsPattern::FromString("www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
     // Test that |ignore_audio_setting| works.
     EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
+        CONTENT_SETTING_BLOCK,
         CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         true,
         false));
     EXPECT_FALSE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
         CONTENT_SETTING_ASK,
+        CONTENT_SETTING_ASK,
         ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
         false,
         false));
   }
 }