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

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

Issue 106433007: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years 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/content_settings/content_settings_pref_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index bdea038651e3358ace04df140df7e1122d54f513..9f91056a595ea35384fb441a4e6683fbd7a84acf 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -122,7 +122,7 @@ TEST_F(PrefProviderTest, Observer) {
ContentSettingsPattern::Wildcard(),
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
- Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+ base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
pref_content_settings_provider.ShutdownOnUIThread();
}
@@ -171,7 +171,7 @@ TEST_F(PrefProviderTest, Incognito) {
pattern,
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
- Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+ base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
GURL host("http://example.com/");
// The value should of course be visible in the regular PrefProvider.
@@ -226,7 +226,8 @@ TEST_F(PrefProviderTest, GetContentSettingsValue) {
primary_pattern,
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
- Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+ base::Value::CreateIntegerValue(
+ CONTENT_SETTING_BLOCK));
EXPECT_EQ(CONTENT_SETTING_BLOCK,
GetContentSetting(&provider,
primary_url,
@@ -234,7 +235,7 @@ TEST_F(PrefProviderTest, GetContentSettingsValue) {
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
false));
- scoped_ptr<Value> value_ptr(
+ scoped_ptr<base::Value> value_ptr(
GetContentSettingValue(&provider,
primary_url,
primary_url,
@@ -288,7 +289,7 @@ TEST_F(PrefProviderTest, Patterns) {
pattern1,
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
- Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+ base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
EXPECT_EQ(CONTENT_SETTING_BLOCK,
GetContentSetting(&pref_content_settings_provider,
host1,
@@ -316,7 +317,7 @@ TEST_F(PrefProviderTest, Patterns) {
pattern2,
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
- Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+ base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
EXPECT_EQ(CONTENT_SETTING_BLOCK,
GetContentSetting(&pref_content_settings_provider,
host3,
@@ -337,7 +338,7 @@ TEST_F(PrefProviderTest, Patterns) {
pattern3,
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
- Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+ base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
EXPECT_EQ(CONTENT_SETTING_BLOCK,
GetContentSetting(&pref_content_settings_provider,
host4,
@@ -370,7 +371,7 @@ TEST_F(PrefProviderTest, ResourceIdentifier) {
pattern,
CONTENT_SETTINGS_TYPE_PLUGINS,
resource1,
- Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+ base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
EXPECT_EQ(CONTENT_SETTING_BLOCK,
GetContentSetting(
&pref_content_settings_provider,
@@ -407,7 +408,7 @@ TEST_F(PrefProviderTest, AutoSubmitCertificateContentSetting) {
ContentSettingsPattern::Wildcard(),
CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
std::string(),
- Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+ base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
EXPECT_EQ(CONTENT_SETTING_ALLOW,
GetContentSetting(
&provider,
@@ -434,7 +435,7 @@ TEST_F(PrefProviderTest, Deadlock) {
{
DictionaryPrefUpdate update(&prefs,
prefs::kContentSettingsPatternPairs);
- DictionaryValue* mutable_settings = update.Get();
+ base::DictionaryValue* mutable_settings = update.Get();
mutable_settings->SetWithoutPathExpansion("www.example.com,*",
new base::DictionaryValue());
}

Powered by Google App Engine
This is Rietveld 408576698