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

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

Issue 4192012: Convert implicit scoped_refptr constructor calls to explicit ones, part 1 (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: fix presubmit Created 10 years, 1 month 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <map> 8 #include <map>
9 9
10 #include "net/base/address_list.h" 10 #include "net/base/address_list.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 EXPECT_TRUE(LogContainsBeginEvent(net_log_.entries(), 0, 134 EXPECT_TRUE(LogContainsBeginEvent(net_log_.entries(), 0,
135 NetLog::TYPE_SOCKS5_CONNECT)); 135 NetLog::TYPE_SOCKS5_CONNECT));
136 136
137 rv = callback_.WaitForResult(); 137 rv = callback_.WaitForResult();
138 138
139 EXPECT_EQ(OK, rv); 139 EXPECT_EQ(OK, rv);
140 EXPECT_TRUE(user_sock_->IsConnected()); 140 EXPECT_TRUE(user_sock_->IsConnected());
141 EXPECT_TRUE(LogContainsEndEvent(net_log_.entries(), -1, 141 EXPECT_TRUE(LogContainsEndEvent(net_log_.entries(), -1,
142 NetLog::TYPE_SOCKS5_CONNECT)); 142 NetLog::TYPE_SOCKS5_CONNECT));
143 143
144 scoped_refptr<IOBuffer> buffer = new IOBuffer(payload_write.size()); 144 scoped_refptr<IOBuffer> buffer(new IOBuffer(payload_write.size()));
145 memcpy(buffer->data(), payload_write.data(), payload_write.size()); 145 memcpy(buffer->data(), payload_write.data(), payload_write.size());
146 rv = user_sock_->Write(buffer, payload_write.size(), &callback_); 146 rv = user_sock_->Write(buffer, payload_write.size(), &callback_);
147 EXPECT_EQ(ERR_IO_PENDING, rv); 147 EXPECT_EQ(ERR_IO_PENDING, rv);
148 rv = callback_.WaitForResult(); 148 rv = callback_.WaitForResult();
149 EXPECT_EQ(static_cast<int>(payload_write.size()), rv); 149 EXPECT_EQ(static_cast<int>(payload_write.size()), rv);
150 150
151 buffer = new IOBuffer(payload_read.size()); 151 buffer = new IOBuffer(payload_read.size());
152 rv = user_sock_->Read(buffer, payload_read.size(), &callback_); 152 rv = user_sock_->Read(buffer, payload_read.size(), &callback_);
153 EXPECT_EQ(ERR_IO_PENDING, rv); 153 EXPECT_EQ(ERR_IO_PENDING, rv);
154 rv = callback_.WaitForResult(); 154 rv = callback_.WaitForResult();
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 EXPECT_EQ(OK, rv); 333 EXPECT_EQ(OK, rv);
334 EXPECT_TRUE(user_sock_->IsConnected()); 334 EXPECT_TRUE(user_sock_->IsConnected());
335 EXPECT_TRUE(LogContainsEndEvent(net_log_.entries(), -1, 335 EXPECT_TRUE(LogContainsEndEvent(net_log_.entries(), -1,
336 NetLog::TYPE_SOCKS5_CONNECT)); 336 NetLog::TYPE_SOCKS5_CONNECT));
337 } 337 }
338 } 338 }
339 339
340 } // namespace 340 } // namespace
341 341
342 } // namespace net 342 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/deterministic_socket_data_unittest.cc ('k') | net/socket/socks_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698