summaryrefslogtreecommitdiffstats
path: root/sync/notifier
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 19:42:19 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 19:42:19 +0000
commit0c6c1e43289fc2e225a6c824aff40c9b63b5df78 (patch)
tree9ab1034e260c5887ecc7a70cd112cef97458582a /sync/notifier
parentae0c0f6af00c25b6c41c9e37e8cb849de9a9a680 (diff)
downloadchromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.zip
chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.gz
chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.bz2
Add base namespace to more values in sync and elsewhere.
This makes sync and net compile with no "using *Value". BUG= Review URL: https://codereview.chromium.org/17034006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/notifier')
-rw-r--r--sync/notifier/object_id_invalidation_map.cc4
-rw-r--r--sync/notifier/p2p_invalidator.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/sync/notifier/object_id_invalidation_map.cc b/sync/notifier/object_id_invalidation_map.cc
index 5fa253e..47b08e6 100644
--- a/sync/notifier/object_id_invalidation_map.cc
+++ b/sync/notifier/object_id_invalidation_map.cc
@@ -56,10 +56,10 @@ bool ObjectIdInvalidationMapEquals(
scoped_ptr<base::ListValue> ObjectIdInvalidationMapToValue(
const ObjectIdInvalidationMap& invalidation_map) {
- scoped_ptr<ListValue> value(new ListValue());
+ scoped_ptr<base::ListValue> value(new base::ListValue());
for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
it != invalidation_map.end(); ++it) {
- DictionaryValue* entry = new DictionaryValue();
+ base::DictionaryValue* entry = new base::DictionaryValue();
entry->Set("objectId", ObjectIdToValue(it->first).release());
entry->Set("state", it->second.ToValue().release());
value->Append(entry);
diff --git a/sync/notifier/p2p_invalidator.cc b/sync/notifier/p2p_invalidator.cc
index 7825757..8b54c04 100644
--- a/sync/notifier/p2p_invalidator.cc
+++ b/sync/notifier/p2p_invalidator.cc
@@ -100,7 +100,7 @@ bool P2PNotificationData::Equals(const P2PNotificationData& other) const {
}
std::string P2PNotificationData::ToString() const {
- scoped_ptr<DictionaryValue> dict(new DictionaryValue());
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
dict->SetString(kSenderIdKey, sender_id_);
dict->SetString(kNotificationTypeKey,
P2PNotificationTargetToString(target_));
@@ -112,7 +112,7 @@ std::string P2PNotificationData::ToString() const {
}
bool P2PNotificationData::ResetFromString(const std::string& str) {
- scoped_ptr<Value> data_value(base::JSONReader::Read(str));
+ scoped_ptr<base::Value> data_value(base::JSONReader::Read(str));
const base::DictionaryValue* data_dict = NULL;
if (!data_value.get() || !data_value->GetAsDictionary(&data_dict)) {
LOG(WARNING) << "Could not parse " << str << " as a dictionary";