Index: components/content_settings/core/browser/content_settings_provider_unittest.cc |
diff --git a/components/content_settings/core/browser/content_settings_provider_unittest.cc b/components/content_settings/core/browser/content_settings_provider_unittest.cc |
index 9b7d217725249e4184321743c4d88387a942250f..f07c6d237987ee40808cd3f82a594bd3d6b07080 100644 |
--- a/components/content_settings/core/browser/content_settings_provider_unittest.cc |
+++ b/components/content_settings/core/browser/content_settings_provider_unittest.cc |
@@ -18,12 +18,9 @@ TEST(ContentSettingsProviderTest, Mock) { |
GURL url("http://www.youtube.com"); |
MockProvider mock_provider(false); |
- mock_provider.SetWebsiteSetting( |
- pattern, |
- pattern, |
- CONTENT_SETTINGS_TYPE_PLUGINS, |
- "java_plugin", |
- new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
+ mock_provider.SetWebsiteSetting(pattern, pattern, |
+ CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin", |
+ new base::Value(CONTENT_SETTING_BLOCK)); |
EXPECT_EQ(CONTENT_SETTING_BLOCK, |
TestUtils::GetContentSetting(&mock_provider, url, url, |
@@ -52,11 +49,8 @@ TEST(ContentSettingsProviderTest, Mock) { |
CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), false)); |
bool owned = mock_provider.SetWebsiteSetting( |
- pattern, |
- pattern, |
- CONTENT_SETTINGS_TYPE_PLUGINS, |
- "java_plugin", |
- new base::FundamentalValue(CONTENT_SETTING_ALLOW)); |
+ pattern, pattern, CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin", |
+ new base::Value(CONTENT_SETTING_ALLOW)); |
EXPECT_TRUE(owned); |
EXPECT_EQ(CONTENT_SETTING_ALLOW, |
TestUtils::GetContentSetting(&mock_provider, url, url, |
@@ -64,8 +58,7 @@ TEST(ContentSettingsProviderTest, Mock) { |
"java_plugin", false)); |
mock_provider.set_read_only(true); |
- std::unique_ptr<base::Value> value( |
- new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
+ std::unique_ptr<base::Value> value(new base::Value(CONTENT_SETTING_BLOCK)); |
owned = mock_provider.SetWebsiteSetting( |
pattern, |
pattern, |
@@ -82,11 +75,8 @@ TEST(ContentSettingsProviderTest, Mock) { |
mock_provider.set_read_only(false); |
owned = mock_provider.SetWebsiteSetting( |
- pattern, |
- pattern, |
- CONTENT_SETTINGS_TYPE_PLUGINS, |
- "java_plugin", |
- new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
+ pattern, pattern, CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin", |
+ new base::Value(CONTENT_SETTING_BLOCK)); |
EXPECT_TRUE(owned); |
EXPECT_EQ(CONTENT_SETTING_BLOCK, |
TestUtils::GetContentSetting(&mock_provider, url, url, |