Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1118)

Unified Diff: chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc

Issue 2919343005: Remove tests for deprecated Options UI (Closed)
Patch Set: and more Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
diff --git a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
deleted file mode 100644
index dd1317c88c216f635c90e4622dd332679cfa803e..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-// 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 <stddef.h>
-
-#include "base/macros.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using options::MediaException;
-using options::MediaExceptions;
-using options::PepperFlashContentSettingsUtils;
-
-namespace {
-
-MediaExceptions ConvertAndSort(const MediaException* items, size_t count) {
- MediaExceptions result(items, items + count);
- PepperFlashContentSettingsUtils::SortMediaExceptions(&result);
- return result;
-}
-
-} // namespace
-
-TEST(PepperFlashContentSettingsUtilsTest, SortMediaExceptions) {
- MediaException entry_1(ContentSettingsPattern::FromString("www.google.com"),
- CONTENT_SETTING_ALLOW);
- MediaException entry_2(ContentSettingsPattern::FromString("www.youtube.com"),
- CONTENT_SETTING_BLOCK);
- MediaException entry_3(ContentSettingsPattern::Wildcard(),
- CONTENT_SETTING_ASK);
- MediaException entry_4(ContentSettingsPattern(),
- CONTENT_SETTING_SESSION_ONLY);
-
- MediaExceptions list_1;
- list_1.push_back(entry_1);
- list_1.push_back(entry_2);
- list_1.push_back(entry_3);
- list_1.push_back(entry_4);
-
- MediaExceptions list_2;
- list_2.push_back(entry_1);
- list_2.push_back(entry_3);
- list_2.push_back(entry_2);
- list_2.push_back(entry_4);
-
- MediaExceptions list_3;
- list_3.push_back(entry_4);
- list_3.push_back(entry_1);
- list_3.push_back(entry_2);
- list_3.push_back(entry_3);
-
- EXPECT_NE(list_1, list_2);
- EXPECT_NE(list_2, list_3);
- EXPECT_NE(list_3, list_1);
-
- PepperFlashContentSettingsUtils::SortMediaExceptions(&list_1);
- PepperFlashContentSettingsUtils::SortMediaExceptions(&list_2);
- PepperFlashContentSettingsUtils::SortMediaExceptions(&list_3);
-
- EXPECT_EQ(list_1, list_2);
- 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,
- MediaExceptions(),
- CONTENT_SETTING_ASK,
- MediaExceptions()));
- }
-
- {
- MediaException exceptions_1[] = {
- MediaException(ContentSettingsPattern::FromString("www.google.com"),
- CONTENT_SETTING_ALLOW),
- MediaException(ContentSettingsPattern::FromString("www.youtube.com"),
- CONTENT_SETTING_ASK)
- };
-
- MediaException exceptions_2[] = {
- MediaException(ContentSettingsPattern::FromString("www.google.com"),
- 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,
- ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
- CONTENT_SETTING_ASK,
- ConvertAndSort(exceptions_2, arraysize(exceptions_2))));
- EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
- CONTENT_SETTING_ASK,
- ConvertAndSort(exceptions_2, arraysize(exceptions_2)),
- CONTENT_SETTING_ALLOW,
- ConvertAndSort(exceptions_1, arraysize(exceptions_1))));
- // Changing |default_setting_2| should change the result.
- EXPECT_FALSE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
- CONTENT_SETTING_ALLOW,
- ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
- CONTENT_SETTING_ALLOW,
- ConvertAndSort(exceptions_2, arraysize(exceptions_2))));
- }
-
- {
- // 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),
- MediaException(ContentSettingsPattern::FromString("www.google.com"),
- CONTENT_SETTING_ALLOW)
- };
-
- MediaException exceptions_2[] = {
- MediaException(ContentSettingsPattern::FromString("www.google.com"),
- CONTENT_SETTING_ALLOW)
- };
-
- EXPECT_TRUE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
- CONTENT_SETTING_ALLOW,
- ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
- CONTENT_SETTING_ASK,
- ConvertAndSort(exceptions_2, arraysize(exceptions_2))));
- EXPECT_FALSE(PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(
- CONTENT_SETTING_ALLOW,
- ConvertAndSort(exceptions_1, arraysize(exceptions_1)),
- CONTENT_SETTING_ALLOW,
- ConvertAndSort(exceptions_2, arraysize(exceptions_2))));
- }
-}

Powered by Google App Engine
This is Rietveld 408576698