Update webrtc to r4819.

jingle/glue/channel_socket_adapter_unittest.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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 16 matching lines @@
 const int kTestError = -32123;
 }  // namespace
 
 class MockTransportChannel : public cricket::TransportChannel {
  public:
   MockTransportChannel() : cricket::TransportChannel(std::string(), 0) {
     set_writable(true);
     set_readable(true);
   }
 
-  MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags));
+  MOCK_METHOD4(SendPacket, int(const char* data,
+                               size_t len,
+                               talk_base::DiffServCodePoint dscp,
+                               int flags));
   MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
   MOCK_METHOD0(GetError, int());
   MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole());
   MOCK_METHOD1(GetStats, bool(cricket::ConnectionInfos* infos));
   MOCK_CONST_METHOD0(IsDtlsActive, bool());
   MOCK_CONST_METHOD1(GetSslRole, bool(talk_base::SSLRole* role));
   MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
   MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
   MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label,
                                           const uint8* context,
@@ skipping 49 matching lines @@
   EXPECT_EQ(kTestError, callback_result_);
 
   // All Read() calls after Close() should return the error.
   EXPECT_EQ(kTestError, target_->Read(buffer.get(), kBufferSize, callback_));
 }
 
 // Verify that Write sends the packet and returns correct result.
 TEST_F(TransportChannelSocketAdapterTest, Write) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
+                                   talk_base::DSCP_NO_CHANGE, 0))
       .WillOnce(Return(kTestDataSize));
 
   int result = target_->Write(buffer.get(), kTestDataSize, callback_);
   EXPECT_EQ(kTestDataSize, result);
 }
 
 // Verify that the message is still sent if Write() is called while
 // socket is not open yet. The result is the packet is lost.
 TEST_F(TransportChannelSocketAdapterTest, WritePending) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
+                                   talk_base::DSCP_NO_CHANGE, 0))
       .Times(1)
       .WillOnce(Return(SOCKET_ERROR));
 
   EXPECT_CALL(channel_, GetError())
       .WillOnce(Return(EWOULDBLOCK));
 
   int result = target_->Write(buffer.get(), kTestDataSize, callback_);
   ASSERT_EQ(net::OK, result);
 }
 
 }  // namespace jingle_glue