Roll libjingle 132:133

jingle/glue/channel_socket_adapter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "jingle/glue/channel_socket_adapter.h"
 
 #include <limits>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 118 matching lines @@
 
   if (!write_callback_.is_null()) {
     net::CompletionCallback callback = write_callback_;
     write_callback_.Reset();
     write_buffer_ = NULL;
     callback.Run(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()) {
     DCHECK(read_buffer_);
     CHECK_LT(data_size, static_cast<size_t>(std::numeric_limits<int>::max()));
 
     if (read_buffer_size_ < static_cast<int>(data_size)) {
       LOG(WARNING) << "Data buffer is smaller than the received packet. "
                    << "Dropping the data that doesn't fit.";
       data_size = read_buffer_size_;
@@ skipping 32 matching lines @@
 }
 
 void TransportChannelSocketAdapter::OnChannelDestroyed(
     cricket::TransportChannel* channel) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_EQ(channel, channel_);
   Close(net::ERR_CONNECTION_ABORTED);
 }
 
 }  // namespace jingle_glue