Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: remoting/protocol/channel_socket_adapter_unittest.cc

Issue 1946553002: WebRTC's scoped_ptr and scoped_ptr.h are going away, so stop using them (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/host/desktop_session_agent.cc ('k') | remoting/protocol/fake_desktop_capturer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/channel_socket_adapter.h" 5 #include "remoting/protocol/channel_socket_adapter.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 MOCK_CONST_METHOD0(IsDtlsActive, bool()); 50 MOCK_CONST_METHOD0(IsDtlsActive, bool());
51 MOCK_CONST_METHOD1(GetSslRole, bool(rtc::SSLRole* role)); 51 MOCK_CONST_METHOD1(GetSslRole, bool(rtc::SSLRole* role));
52 MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers)); 52 MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
53 MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher)); 53 MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
54 MOCK_METHOD1(GetSslCipher, bool(std::string* cipher)); 54 MOCK_METHOD1(GetSslCipher, bool(std::string* cipher));
55 MOCK_CONST_METHOD0(GetLocalCertificate, 55 MOCK_CONST_METHOD0(GetLocalCertificate,
56 rtc::scoped_refptr<rtc::RTCCertificate>()); 56 rtc::scoped_refptr<rtc::RTCCertificate>());
57 57
58 // This can't be a real mock method because gmock doesn't support move-only 58 // This can't be a real mock method because gmock doesn't support move-only
59 // return values. 59 // return values.
60 rtc::scoped_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate() 60 std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate()
61 const override { 61 const override {
62 EXPECT_TRUE(false); // Never called. 62 EXPECT_TRUE(false); // Never called.
63 return nullptr; 63 return nullptr;
64 } 64 }
65 65
66 MOCK_METHOD6(ExportKeyingMaterial, 66 MOCK_METHOD6(ExportKeyingMaterial,
67 bool(const std::string& label, 67 bool(const std::string& label,
68 const uint8_t* context, 68 const uint8_t* context,
69 size_t context_len, 69 size_t context_len,
70 bool use_context, 70 bool use_context,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 EXPECT_CALL(channel_, GetError()) 145 EXPECT_CALL(channel_, GetError())
146 .WillOnce(Return(EWOULDBLOCK)); 146 .WillOnce(Return(EWOULDBLOCK));
147 147
148 int result = target_->Send(buffer.get(), kTestDataSize, callback_); 148 int result = target_->Send(buffer.get(), kTestDataSize, callback_);
149 ASSERT_EQ(net::OK, result); 149 ASSERT_EQ(net::OK, result);
150 } 150 }
151 151
152 } // namespace protocol 152 } // namespace protocol
153 } // namespace remoting 153 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/desktop_session_agent.cc ('k') | remoting/protocol/fake_desktop_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698