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

Unified Diff: chrome/browser/notifications/desktop_notification_profile_util_unittest.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: ps 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/notifications/desktop_notification_profile_util_unittest.cc
diff --git a/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc b/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc
index 28c331e089c3b1faa732fc64a8ead9590dc768c8..9193a97b31422ae0a47e8042dc5b1a07d9041ada 100644
--- a/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc
+++ b/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
#include "chrome/browser/notifications/desktop_notification_profile_util.h"
+
+#include "base/bind.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/content_settings/core/common/content_settings_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
class DesktopNotificationServiceTest : public ChromeRenderViewHostTestHarness {
@@ -33,25 +35,25 @@ TEST_F(DesktopNotificationServiceTest, GetNotificationsSettings) {
EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(
GURL("http://allowed.com")),
settings[0].primary_pattern);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- settings[0].setting);
+ EXPECT_EQ(CONTENT_SETTING_ALLOW, content_settings::ValueToContentSetting(
+ settings[0].setting_value.get()));
EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(
GURL("http://allowed2.com")),
settings[1].primary_pattern);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- settings[1].setting);
+ EXPECT_EQ(CONTENT_SETTING_ALLOW, content_settings::ValueToContentSetting(
+ settings[1].setting_value.get()));
EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(
GURL("http://denied.com")),
settings[2].primary_pattern);
- EXPECT_EQ(CONTENT_SETTING_BLOCK,
- settings[2].setting);
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, content_settings::ValueToContentSetting(
+ settings[2].setting_value.get()));
EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(
GURL("http://denied2.com")),
settings[3].primary_pattern);
- EXPECT_EQ(CONTENT_SETTING_BLOCK,
- settings[3].setting);
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, content_settings::ValueToContentSetting(
+ settings[3].setting_value.get()));
EXPECT_EQ(ContentSettingsPattern::Wildcard(),
settings[4].primary_pattern);
- EXPECT_EQ(CONTENT_SETTING_ASK,
- settings[4].setting);
+ EXPECT_EQ(CONTENT_SETTING_ASK, content_settings::ValueToContentSetting(
+ settings[4].setting_value.get()));
}

Powered by Google App Engine
This is Rietveld 408576698