From 0c6c1e43289fc2e225a6c824aff40c9b63b5df78 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 21 Jun 2013 19:42:19 +0000 Subject: 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 --- jingle/glue/utils.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'jingle/glue') diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc index d58fce0..bc548ea 100644 --- a/jingle/glue/utils.cc +++ b/jingle/glue/utils.cc @@ -35,7 +35,7 @@ bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address, std::string SerializeP2PCandidate(const cricket::Candidate& candidate) { // TODO(sergeyu): Use SDP to format candidates? - DictionaryValue value; + base::DictionaryValue value; value.SetString("ip", candidate.address().ipaddr().ToString()); value.SetInteger("port", candidate.address().port()); value.SetString("type", candidate.type()); @@ -52,13 +52,14 @@ std::string SerializeP2PCandidate(const cricket::Candidate& candidate) { bool DeserializeP2PCandidate(const std::string& candidate_str, cricket::Candidate* candidate) { - scoped_ptr value( + scoped_ptr value( base::JSONReader::Read(candidate_str, base::JSON_ALLOW_TRAILING_COMMAS)); - if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) { + if (!value.get() || !value->IsType(base::Value::TYPE_DICTIONARY)) { return false; } - DictionaryValue* dic_value = static_cast(value.get()); + base::DictionaryValue* dic_value = + static_cast(value.get()); std::string ip; int port; -- cgit v1.1