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

Unified Diff: sync/notifier/p2p_invalidator.cc

Issue 17034006: Add base namespace to more values in sync and elsewhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months 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
« no previous file with comments | « sync/notifier/object_id_invalidation_map.cc ('k') | sync/protocol/proto_value_conversions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/notifier/p2p_invalidator.cc
diff --git a/sync/notifier/p2p_invalidator.cc b/sync/notifier/p2p_invalidator.cc
index 78257575d8834f443d3947dda07ccf0d2cc541a9..8b54c0417ee8f5f466f309d412d918c11b6e917f 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";
« no previous file with comments | « sync/notifier/object_id_invalidation_map.cc ('k') | sync/protocol/proto_value_conversions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698