Remove the Value class names from the global namespace.
BUG=88666
TEST=no change
[email protected]
Review URL: https://codereview.chromium.org/116543010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242440 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/prefs/scoped_user_pref_update.cc b/base/prefs/scoped_user_pref_update.cc
index c86b163..41b654c 100644
--- a/base/prefs/scoped_user_pref_update.cc
+++ b/base/prefs/scoped_user_pref_update.cc
@@ -20,7 +20,7 @@
Notify();
}
-Value* ScopedUserPrefUpdateBase::GetValueOfType(base::Value::Type type) {
+base::Value* ScopedUserPrefUpdateBase::GetValueOfType(base::Value::Type type) {
if (!value_)
value_ = service_->GetMutableUserPref(path_.c_str(), type);
return value_;
diff --git a/base/prefs/scoped_user_pref_update_unittest.cc b/base/prefs/scoped_user_pref_update_unittest.cc
index 505526c0..dfe20747 100644
--- a/base/prefs/scoped_user_pref_update_unittest.cc
+++ b/base/prefs/scoped_user_pref_update_unittest.cc
@@ -40,13 +40,13 @@
TEST_F(ScopedUserPrefUpdateTest, RegularUse) {
// Dictionary that will be expected to be set at the end.
- DictionaryValue expected_dictionary;
+ base::DictionaryValue expected_dictionary;
expected_dictionary.SetString(kKey, kValue);
{
EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
DictionaryPrefUpdate update(&prefs_, kPref);
- DictionaryValue* value = update.Get();
+ base::DictionaryValue* value = update.Get();
ASSERT_TRUE(value);
value->SetString(kKey, kValue);
@@ -55,7 +55,7 @@
Mock::VerifyAndClearExpectations(&observer_);
// Modifications happen online and are instantly visible, though.
- const DictionaryValue* current_value = prefs_.GetDictionary(kPref);
+ const base::DictionaryValue* current_value = prefs_.GetDictionary(kPref);
ASSERT_TRUE(current_value);
EXPECT_TRUE(expected_dictionary.Equals(current_value));
@@ -64,18 +64,18 @@
}
Mock::VerifyAndClearExpectations(&observer_);
- const DictionaryValue* current_value = prefs_.GetDictionary(kPref);
+ const base::DictionaryValue* current_value = prefs_.GetDictionary(kPref);
ASSERT_TRUE(current_value);
EXPECT_TRUE(expected_dictionary.Equals(current_value));
}
TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) {
- const DictionaryValue* old_value = prefs_.GetDictionary(kPref);
+ const base::DictionaryValue* old_value = prefs_.GetDictionary(kPref);
EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
{
DictionaryPrefUpdate update(&prefs_, kPref);
}
- const DictionaryValue* new_value = prefs_.GetDictionary(kPref);
+ const base::DictionaryValue* new_value = prefs_.GetDictionary(kPref);
EXPECT_EQ(old_value, new_value);
Mock::VerifyAndClearExpectations(&observer_);
}
