Move P2P candidate serialization/deserialization to jingle/glue.

TEST=Compiles
BUG=None.

Review URL: http://codereview.chromium.org/7551034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96079 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/p2p/p2p_transport_impl.cc

@@ -4,14 +4,13 @@
 
 #include "content/renderer/p2p/p2p_transport_impl.h"
 
-#include "base/values.h"
-#include "content/common/json_value_serializer.h"
 #include "content/renderer/p2p/ipc_network_manager.h"
 #include "content/renderer/p2p/ipc_socket_factory.h"
 #include "content/renderer/render_view.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
 #include "jingle/glue/thread_wrapper.h"
+#include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
 #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
 #include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
@@ -90,7 +89,8 @@ bool P2PTransportImpl::Init(const std::string& name,
 
 bool P2PTransportImpl::AddRemoteCandidate(const std::string& address) {
   cricket::Candidate candidate;
-  if (!DeserializeCandidate(address, &candidate)) {
+  if (!jingle_glue::DeserializeP2PCandidate(address, &candidate)) {
+    LOG(ERROR) << "Failed to parse candidate " << address;
     return false;
   }
 
@@ -105,7 +105,8 @@ void P2PTransportImpl::OnRequestSignaling() {
 void P2PTransportImpl::OnCandidateReady(
     cricket::TransportChannelImpl* channel,
     const cricket::Candidate& candidate) {
-  event_handler_->OnCandidateReady(SerializeCandidate(candidate));
+  event_handler_->OnCandidateReady(
+      jingle_glue::SerializeP2PCandidate(candidate));
 }
 
 void P2PTransportImpl::OnReadableState(cricket::TransportChannel* channel) {
@@ -118,71 +119,6 @@ void P2PTransportImpl::OnWriteableState(cricket::TransportChannel* channel) {
   event_handler_->OnStateChange(state_);
 }
 
-std::string P2PTransportImpl::SerializeCandidate(
-    const cricket::Candidate& candidate) {
-
-  // TODO(sergeyu): Use SDP to format candidates?
-  DictionaryValue value;
-  value.SetString("name", candidate.name());
-  value.SetString("ip", candidate.address().IPAsString());
-  value.SetInteger("port", candidate.address().port());
-  value.SetString("type", candidate.type());
-  value.SetString("protocol", candidate.protocol());
-  value.SetString("username", candidate.username());
-  value.SetString("password", candidate.password());
-  value.SetDouble("preference", candidate.preference());
-  value.SetInteger("generation", candidate.generation());
-
-  std::string result;
-  JSONStringValueSerializer serializer(&result);
-  serializer.Serialize(value);
-  return result;
-}
-
-bool P2PTransportImpl::DeserializeCandidate(const std::string& address,
-                                            cricket::Candidate* candidate) {
-  JSONStringValueSerializer deserializer(address);
-  scoped_ptr<Value> value(deserializer.Deserialize(NULL, NULL));
-  if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
-    return false;
-  }
-
-  DictionaryValue* dic_value = static_cast<DictionaryValue*>(value.get());
-
-  std::string name;
-  std::string ip;
-  int port;
-  std::string type;
-  std::string protocol;
-  std::string username;
-  std::string password;
-  double preference;
-  int generation;
-
-  if (!dic_value->GetString("name", &name) ||
-      !dic_value->GetString("ip", &ip) ||
-      !dic_value->GetInteger("port", &port) ||
-      !dic_value->GetString("type", &type) ||
-      !dic_value->GetString("protocol", &protocol) ||
-      !dic_value->GetString("username", &username) ||
-      !dic_value->GetString("password", &password) ||
-      !dic_value->GetDouble("preference", &preference) ||
-      !dic_value->GetInteger("generation", &generation)) {
-    return false;
-  }
-
-  candidate->set_name(name);
-  candidate->set_address(talk_base::SocketAddress(ip, port));
-  candidate->set_type(type);
-  candidate->set_protocol(protocol);
-  candidate->set_username(username);
-  candidate->set_password(password);
-  candidate->set_preference(static_cast<float>(preference));
-  candidate->set_generation(generation);
-
-  return true;
-}
-
 net::Socket* P2PTransportImpl::GetChannel() {
   if (pseudo_tcp_adapter_.get()) {
     DCHECK(!channel_adapter_.get());

content/renderer/p2p/p2p_transport_impl.h

@@ -66,10 +66,6 @@ class P2PTransportImpl : public webkit_glue::P2PTransport,
   void OnReadableState(cricket::TransportChannel* channel);
   void OnWriteableState(cricket::TransportChannel* channel);
 
-  std::string SerializeCandidate(const cricket::Candidate& candidate);
-  bool DeserializeCandidate(const std::string& address,
-                            cricket::Candidate* candidate);
-
   void OnTcpConnected(int result);
 
   std::string name_;

jingle/glue/utils.cc

@@ -4,11 +4,16 @@
 
 #include "jingle/glue/utils.h"
 
+#include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 #include "third_party/libjingle/source/talk/base/byteorder.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
+#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 
 namespace jingle_glue {
 
@@ -34,4 +39,65 @@ bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address_lj,
   return true;
 }
 
+std::string SerializeP2PCandidate(const cricket::Candidate& candidate) {
+  // TODO(sergeyu): Use SDP to format candidates?
+  DictionaryValue value;
+  value.SetString("name", candidate.name());
+  value.SetString("ip", candidate.address().IPAsString());
+  value.SetInteger("port", candidate.address().port());
+  value.SetString("type", candidate.type());
+  value.SetString("protocol", candidate.protocol());
+  value.SetString("username", candidate.username());
+  value.SetString("password", candidate.password());
+  value.SetDouble("preference", candidate.preference());
+  value.SetInteger("generation", candidate.generation());
+
+  std::string result;
+  base::JSONWriter::Write(&value, false, &result);
+  return result;
+}
+
+bool DeserializeP2PCandidate(const std::string& candidate_str,
+                             cricket::Candidate* candidate) {
+  scoped_ptr<Value> value(base::JSONReader::Read(candidate_str, true));
+  if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
+    return false;
+  }
+
+  DictionaryValue* dic_value = static_cast<DictionaryValue*>(value.get());
+
+  std::string name;
+  std::string ip;
+  int port;
+  std::string type;
+  std::string protocol;
+  std::string username;
+  std::string password;
+  double preference;
+  int generation;
+
+  if (!dic_value->GetString("name", &name) ||
+      !dic_value->GetString("ip", &ip) ||
+      !dic_value->GetInteger("port", &port) ||
+      !dic_value->GetString("type", &type) ||
+      !dic_value->GetString("protocol", &protocol) ||
+      !dic_value->GetString("username", &username) ||
+      !dic_value->GetString("password", &password) ||
+      !dic_value->GetDouble("preference", &preference) ||
+      !dic_value->GetInteger("generation", &generation)) {
+    return false;
+  }
+
+  candidate->set_name(name);
+  candidate->set_address(talk_base::SocketAddress(ip, port));
+  candidate->set_type(type);
+  candidate->set_protocol(protocol);
+  candidate->set_username(username);
+  candidate->set_password(password);
+  candidate->set_preference(static_cast<float>(preference));
+  candidate->set_generation(generation);
+
+  return true;
+}
+
 }  // namespace jingle_glue

jingle/glue/utils.h

@@ -5,14 +5,20 @@
 #ifndef JINGLE_GLUE_UTILS_H_
 #define JINGLE_GLUE_UTILS_H_
 
+#include <string>
+
 namespace net {
 class IPEndPoint;
 }  // namespace net
 
 namespace talk_base {
-  class SocketAddress;
+class SocketAddress;
 }  // namespace talk_base
 
+namespace cricket {
+class Candidate;
+}  // namespace cricket
+
 namespace jingle_glue {
 
 // Chromium and libjingle represent socket addresses differently. The
@@ -23,6 +29,11 @@ bool IPEndPointToSocketAddress(const net::IPEndPoint& address_chrome,
 bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address_lj,
                                net::IPEndPoint* address_chrome);
 
+// Helper functions to serialize and deserialize P2P candidates.
+std::string SerializeP2PCandidate(const cricket::Candidate& candidate);
+bool DeserializeP2PCandidate(const std::string& address,
+                             cricket::Candidate* candidate);
+
 }  // namespace jingle_glue
 
 #endif  // JINGLE_GLUE_UTILS_H_