Roll webrtc r4533.

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 19 matching lines @@
 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_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
   MOCK_METHOD0(GetError, int());
-  MOCK_CONST_METHOD0(GetRole, cricket::TransportRole());
+  MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole());
 };
 
 class TransportChannelSocketAdapterTest : public testing::Test {
  public:
   TransportChannelSocketAdapterTest()
       : callback_(base::Bind(&TransportChannelSocketAdapterTest::Callback,
                              base::Unretained(this))),
         callback_result_(0) {
   }
 
@@ skipping 59 matching lines @@
       .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