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

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

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/protocol/authenticator.h ('k') | remoting/protocol/buffered_socket_writer.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/authenticator_test_base.h" 5 #include "remoting/protocol/authenticator_test_base.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 shutdown_timer.Start(FROM_HERE, 144 shutdown_timer.Start(FROM_HERE,
145 TestTimeouts::action_timeout(), 145 TestTimeouts::action_timeout(),
146 base::MessageLoop::QuitClosure()); 146 base::MessageLoop::QuitClosure());
147 message_loop_.Run(); 147 message_loop_.Run();
148 shutdown_timer.Stop(); 148 shutdown_timer.Stop();
149 149
150 testing::Mock::VerifyAndClearExpectations(&client_callback_); 150 testing::Mock::VerifyAndClearExpectations(&client_callback_);
151 testing::Mock::VerifyAndClearExpectations(&host_callback_); 151 testing::Mock::VerifyAndClearExpectations(&host_callback_);
152 152
153 if (!expected_fail) { 153 if (!expected_fail) {
154 ASSERT_TRUE(client_socket_.get() != NULL); 154 ASSERT_TRUE(client_socket_.get() != nullptr);
155 ASSERT_TRUE(host_socket_.get() != NULL); 155 ASSERT_TRUE(host_socket_.get() != nullptr);
156 } 156 }
157 } 157 }
158 158
159 void AuthenticatorTestBase::OnHostConnected( 159 void AuthenticatorTestBase::OnHostConnected(
160 int error, 160 int error,
161 scoped_ptr<net::StreamSocket> socket) { 161 scoped_ptr<net::StreamSocket> socket) {
162 host_callback_.OnDone(error); 162 host_callback_.OnDone(error);
163 host_socket_ = socket.Pass(); 163 host_socket_ = socket.Pass();
164 } 164 }
165 165
166 void AuthenticatorTestBase::OnClientConnected( 166 void AuthenticatorTestBase::OnClientConnected(
167 int error, 167 int error,
168 scoped_ptr<net::StreamSocket> socket) { 168 scoped_ptr<net::StreamSocket> socket) {
169 client_callback_.OnDone(error); 169 client_callback_.OnDone(error);
170 client_socket_ = socket.Pass(); 170 client_socket_ = socket.Pass();
171 } 171 }
172 172
173 } // namespace protocol 173 } // namespace protocol
174 } // namespace remoting 174 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/authenticator.h ('k') | remoting/protocol/buffered_socket_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698