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

Side by Side Diff: net/socket/socks5_client_socket_unittest.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('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 "net/socket/socks5_client_socket.h" 5 #include "net/socket/socks5_client_socket.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 10
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 EXPECT_EQ(OK, rv); 145 EXPECT_EQ(OK, rv);
146 EXPECT_TRUE(user_sock_->IsConnected()); 146 EXPECT_TRUE(user_sock_->IsConnected());
147 147
148 net_log_.GetEntries(&net_log_entries); 148 net_log_.GetEntries(&net_log_entries);
149 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, 149 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
150 NetLog::TYPE_SOCKS5_CONNECT)); 150 NetLog::TYPE_SOCKS5_CONNECT));
151 151
152 scoped_refptr<IOBuffer> buffer(new IOBuffer(payload_write.size())); 152 scoped_refptr<IOBuffer> buffer(new IOBuffer(payload_write.size()));
153 memcpy(buffer->data(), payload_write.data(), payload_write.size()); 153 memcpy(buffer->data(), payload_write.data(), payload_write.size());
154 rv = user_sock_->Write(buffer, payload_write.size(), callback_.callback()); 154 rv = user_sock_->Write(
155 buffer.get(), payload_write.size(), callback_.callback());
155 EXPECT_EQ(ERR_IO_PENDING, rv); 156 EXPECT_EQ(ERR_IO_PENDING, rv);
156 rv = callback_.WaitForResult(); 157 rv = callback_.WaitForResult();
157 EXPECT_EQ(static_cast<int>(payload_write.size()), rv); 158 EXPECT_EQ(static_cast<int>(payload_write.size()), rv);
158 159
159 buffer = new IOBuffer(payload_read.size()); 160 buffer = new IOBuffer(payload_read.size());
160 rv = user_sock_->Read(buffer, payload_read.size(), callback_.callback()); 161 rv =
162 user_sock_->Read(buffer.get(), payload_read.size(), callback_.callback());
161 EXPECT_EQ(ERR_IO_PENDING, rv); 163 EXPECT_EQ(ERR_IO_PENDING, rv);
162 rv = callback_.WaitForResult(); 164 rv = callback_.WaitForResult();
163 EXPECT_EQ(static_cast<int>(payload_read.size()), rv); 165 EXPECT_EQ(static_cast<int>(payload_read.size()), rv);
164 EXPECT_EQ(payload_read, std::string(buffer->data(), payload_read.size())); 166 EXPECT_EQ(payload_read, std::string(buffer->data(), payload_read.size()));
165 167
166 user_sock_->Disconnect(); 168 user_sock_->Disconnect();
167 EXPECT_FALSE(tcp_sock_->IsConnected()); 169 EXPECT_FALSE(tcp_sock_->IsConnected());
168 EXPECT_FALSE(user_sock_->IsConnected()); 170 EXPECT_FALSE(user_sock_->IsConnected());
169 } 171 }
170 172
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 EXPECT_TRUE(user_sock_->IsConnected()); 359 EXPECT_TRUE(user_sock_->IsConnected());
358 net_log_.GetEntries(&net_log_entries); 360 net_log_.GetEntries(&net_log_entries);
359 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, 361 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
360 NetLog::TYPE_SOCKS5_CONNECT)); 362 NetLog::TYPE_SOCKS5_CONNECT));
361 } 363 }
362 } 364 }
363 365
364 } // namespace 366 } // namespace
365 367
366 } // namespace net 368 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698