Index: chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc |
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc |
index 9538f1e493b272e1296b811265ba2954df07b8bd..5567ec2dc4abf6456736fdfb4ef7f817d89b69a8 100644 |
--- a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc |
+++ b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc |
@@ -137,18 +137,16 @@ class SiteSettingsHandlerTest : public testing::Test { |
}; |
TEST_F(SiteSettingsHandlerTest, GetAndSetDefault) { |
- ContentSettingsType type = CONTENT_SETTINGS_TYPE_NOTIFICATIONS; |
- |
// Test the JS -> C++ -> JS callback path for getting and setting defaults. |
base::ListValue getArgs; |
getArgs.Append(new base::StringValue(kCallbackId)); |
- getArgs.Append(new base::FundamentalValue(type)); |
+ getArgs.Append(new base::StringValue("notifications")); |
handler()->HandleGetDefaultValueForContentType(&getArgs); |
ValidateDefault(true, 1U); |
// Set the default to 'Blocked'. |
base::ListValue setArgs; |
- setArgs.Append(new base::FundamentalValue(type)); |
+ setArgs.Append(new base::StringValue("notifications")); |
setArgs.Append(new base::StringValue("block")); |
handler()->HandleSetDefaultValueForContentType(&setArgs); |
@@ -160,15 +158,13 @@ TEST_F(SiteSettingsHandlerTest, GetAndSetDefault) { |
} |
TEST_F(SiteSettingsHandlerTest, Origins) { |
- ContentSettingsType type = CONTENT_SETTINGS_TYPE_NOTIFICATIONS; |
- |
// Test the JS -> C++ -> JS callback path for configuring origins, by setting |
// Google.com to blocked. |
base::ListValue setArgs; |
std::string google("http://www.google.com"); |
setArgs.Append(new base::StringValue(google)); // Primary pattern. |
setArgs.Append(new base::StringValue(google)); // Secondary pattern. |
- setArgs.Append(new base::FundamentalValue(type)); |
+ setArgs.Append(new base::StringValue("notifications")); |
setArgs.Append(new base::StringValue("block")); |
handler()->HandleSetCategoryPermissionForOrigin(&setArgs); |
EXPECT_EQ(1U, web_ui()->call_data().size()); |
@@ -176,7 +172,7 @@ TEST_F(SiteSettingsHandlerTest, Origins) { |
// Verify the change was successful. |
base::ListValue listArgs; |
listArgs.Append(new base::StringValue(kCallbackId)); |
- listArgs.Append(new base::FundamentalValue(type)); |
+ listArgs.Append(new base::StringValue("notifications")); |
handler()->HandleGetExceptionList(&listArgs); |
ValidateOrigin(google, google, "block", "preference", 2U); |
@@ -184,7 +180,7 @@ TEST_F(SiteSettingsHandlerTest, Origins) { |
base::ListValue resetArgs; |
resetArgs.Append(new base::StringValue(google)); |
resetArgs.Append(new base::StringValue(google)); |
- resetArgs.Append(new base::FundamentalValue(type)); |
+ resetArgs.Append(new base::StringValue("notifications")); |
handler()->HandleResetCategoryPermissionForOrigin(&resetArgs); |
EXPECT_EQ(3U, web_ui()->call_data().size()); |