Roll libjingle 132:135

Review URL: https://chromiumcodereview.appspot.com/10209008

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

4 files changed, 14 insertions, 13 deletions

diff --git a/jingle/glue/channel_socket_adapter.cc b/jingle/glue/channel_socket_adapter.cc
index 19158a4..b68a5fbc 100644
--- a/jingle/glue/channel_socket_adapter.cc
+++ b/jingle/glue/channel_socket_adapter.cc
@@ -136,7 +136,10 @@ void TransportChannelSocketAdapter::Close(int error_code) {
 }
 
 void TransportChannelSocketAdapter::OnNewPacket(
-    cricket::TransportChannel* channel, const char* data, size_t data_size) {
+    cricket::TransportChannel* channel,
+    const char* data,
+    size_t data_size,
+    int flags) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_EQ(channel, channel_);
   if (!read_callback_.is_null()) {
diff --git a/jingle/glue/channel_socket_adapter.h b/jingle/glue/channel_socket_adapter.h
index a39ef60..b5ed635 100644
--- a/jingle/glue/channel_socket_adapter.h
+++ b/jingle/glue/channel_socket_adapter.h
@@ -50,7 +50,9 @@ class TransportChannelSocketAdapter : public net::Socket,
 
  private:
   void OnNewPacket(cricket::TransportChannel* channel,
-                   const char* data, size_t data_size);
+                   const char* data,
+                   size_t data_size,
+                   int flags);
   void OnWritableState(cricket::TransportChannel* channel);
   void OnChannelDestroyed(cricket::TransportChannel* channel);
 
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 7f5f3ee..40a196f 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -30,12 +30,12 @@ const int kTestError = -32123;
 class MockTransportChannel : public cricket::TransportChannel {
  public:
   MockTransportChannel()
-      : cricket::TransportChannel("", "") {
+      : cricket::TransportChannel("", 0) {
     set_writable(true);
     set_readable(true);
   }
 
-  MOCK_METHOD2(SendPacket, int(const char *data, size_t len));
+  MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags));
   MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
   MOCK_METHOD0(GetError, int());
 };
@@ -72,7 +72,7 @@ TEST_F(TransportChannelSocketAdapterTest, Read) {
   int result = target_->Read(buffer, kBufferSize, callback_);
   ASSERT_EQ(net::ERR_IO_PENDING, result);
 
-  channel_.SignalReadPacket(&channel_, kTestData, kTestDataSize);
+  channel_.SignalReadPacket(&channel_, kTestData, kTestDataSize, 0);
   EXPECT_EQ(kTestDataSize, callback_result_);
 }
 
@@ -94,7 +94,7 @@ TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
 TEST_F(TransportChannelSocketAdapterTest, Write) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
       .WillOnce(Return(kTestDataSize));
 
   int result = target_->Write(buffer, kTestDataSize, callback_);
@@ -106,7 +106,7 @@ TEST_F(TransportChannelSocketAdapterTest, Write) {
 TEST_F(TransportChannelSocketAdapterTest, WritePending) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
       .Times(1)
       .WillOnce(Return(SOCKET_ERROR));
 
diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc
index 03730ad..f18e523 100644
--- a/jingle/glue/utils.cc
+++ b/jingle/glue/utils.cc
@@ -11,7 +11,7 @@
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
-#include "third_party/libjingle/overrides/talk/base/byteorder.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"
 
@@ -42,7 +42,6 @@ bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address_lj,
 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());
@@ -67,7 +66,6 @@ bool DeserializeP2PCandidate(const std::string& candidate_str,
 
   DictionaryValue* dic_value = static_cast<DictionaryValue*>(value.get());
 
-  std::string name;
   std::string ip;
   int port;
   std::string type;
@@ -77,8 +75,7 @@ bool DeserializeP2PCandidate(const std::string& candidate_str,
   double preference;
   int generation;
 
-  if (!dic_value->GetString("name", &name) ||
-      !dic_value->GetString("ip", &ip) ||
+  if (!dic_value->GetString("ip", &ip) ||
       !dic_value->GetInteger("port", &port) ||
       !dic_value->GetString("type", &type) ||
       !dic_value->GetString("protocol", &protocol) ||
@@ -89,7 +86,6 @@ bool DeserializeP2PCandidate(const std::string& candidate_str,
     return false;
   }
 
-  candidate->set_name(name);
   candidate->set_address(talk_base::SocketAddress(ip, port));
   candidate->set_type(type);
   candidate->set_protocol(protocol);