| Index: chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
|
| index 3e4ff2e5d2ed234ef2653dfc314f8d9aea879d2e..1497b6870307256c393b162d0d77ba2685c1e07b 100644
|
| --- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
|
| +++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
|
| @@ -44,7 +44,7 @@ TEST_F(PolicyDefaultProviderTest, DefaultValues) {
|
|
|
| // Set managed-default-content-setting through the coresponding preferences.
|
| prefs->SetManagedPref(prefs::kManagedDefaultCookiesSetting,
|
| - Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
|
| + base::NumberValue::New(CONTENT_SETTING_BLOCK));
|
| ASSERT_TRUE(
|
| provider.DefaultSettingIsManaged(CONTENT_SETTINGS_TYPE_COOKIES));
|
| ASSERT_EQ(CONTENT_SETTING_BLOCK,
|
| @@ -78,7 +78,7 @@ TEST_F(PolicyDefaultProviderTest, DefaultGeolocationContentSetting) {
|
|
|
| //
|
| prefs->SetManagedPref(prefs::kGeolocationDefaultContentSetting,
|
| - Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
|
| + base::NumberValue::New(CONTENT_SETTING_BLOCK));
|
| EXPECT_FALSE(
|
| provider.DefaultSettingIsManaged(CONTENT_SETTINGS_TYPE_GEOLOCATION));
|
| EXPECT_EQ(CONTENT_SETTING_DEFAULT,
|
| @@ -86,7 +86,7 @@ TEST_F(PolicyDefaultProviderTest, DefaultGeolocationContentSetting) {
|
|
|
| // Change the managed value of the default geolocation setting
|
| prefs->SetManagedPref(prefs::kManagedDefaultGeolocationSetting,
|
| - Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
|
| + base::NumberValue::New(CONTENT_SETTING_BLOCK));
|
|
|
| EXPECT_TRUE(
|
| provider.DefaultSettingIsManaged(CONTENT_SETTINGS_TYPE_GEOLOCATION));
|
| @@ -114,7 +114,7 @@ TEST_F(PolicyDefaultProviderTest, ObserveManagedSettingsChange) {
|
|
|
| // Set the managed default-content-setting.
|
| prefs->SetManagedPref(prefs::kManagedDefaultImagesSetting,
|
| - Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
|
| + base::NumberValue::New(CONTENT_SETTING_BLOCK));
|
| ::testing::Mock::VerifyAndClearExpectations(&mock_observer);
|
|
|
| EXPECT_CALL(mock_observer,
|
| @@ -147,7 +147,7 @@ TEST_F(PolicyProviderTest, Default) {
|
| TestingPrefService* prefs = profile.GetTestingPrefService();
|
|
|
| ListValue* value = new ListValue();
|
| - value->Append(Value::CreateStringValue("[*.]google.com"));
|
| + value->Append(base::StringValue::New("[*.]google.com"));
|
| prefs->SetManagedPref(prefs::kManagedImagesBlockedForUrls,
|
| value);
|
|
|
| @@ -187,7 +187,7 @@ TEST_F(PolicyProviderTest, ResourceIdentifier) {
|
| TestingPrefService* prefs = profile.GetTestingPrefService();
|
|
|
| ListValue* value = new ListValue();
|
| - value->Append(Value::CreateStringValue("[*.]google.com"));
|
| + value->Append(base::StringValue::New("[*.]google.com"));
|
| prefs->SetManagedPref(prefs::kManagedPluginsAllowedForUrls,
|
| value);
|
|
|
|
|