Roll WebRTC 9867:9890, Libjingle 9867:9885

remoting/protocol/channel_socket_adapter_unittest.cc

 // Copyright 2015 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 "remoting/protocol/channel_socket_adapter.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "net/base/io_buffer.h"
@@ skipping 31 matching lines @@
                                int flags));
   MOCK_METHOD2(SetOption, int(rtc::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(rtc::SSLRole* role));
   MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
   MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
   MOCK_METHOD1(GetSslCipher, bool(std::string* cipher));
-  MOCK_CONST_METHOD1(GetLocalIdentity, bool(rtc::SSLIdentity** identity));
-  MOCK_CONST_METHOD1(GetRemoteCertificate,
+  MOCK_CONST_METHOD0(GetLocalCertificate,
+                     rtc::scoped_refptr<rtc::RTCCertificate>());
+  MOCK_CONST_METHOD1(GetRemoteSSLCertificate,
                      bool(rtc::SSLCertificate** cert));
   MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label,
                                           const uint8* context,
                                           size_t context_len,
                                           bool use_context,
                                           uint8* result,
                                           size_t result_len));
 };
 
 class TransportChannelSocketAdapterTest : public testing::Test {
@@ skipping 68 matching lines @@
 
   EXPECT_CALL(channel_, GetError())
       .WillOnce(Return(EWOULDBLOCK));
 
   int result = target_->Send(buffer.get(), kTestDataSize, callback_);
   ASSERT_EQ(net::OK, result);
 }
 
 }  // namespace protocol
 }  // namespace remoting