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

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

Issue 6930014: Rename ClientSocket to StreamSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.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) 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 28 matching lines...) Expand all
39 int port, 39 int port,
40 NetLog* net_log); 40 NetLog* net_log);
41 41
42 virtual void SetUp(); 42 virtual void SetUp();
43 43
44 protected: 44 protected:
45 const uint16 kNwPort; 45 const uint16 kNwPort;
46 CapturingNetLog net_log_; 46 CapturingNetLog net_log_;
47 scoped_ptr<SOCKS5ClientSocket> user_sock_; 47 scoped_ptr<SOCKS5ClientSocket> user_sock_;
48 AddressList address_list_; 48 AddressList address_list_;
49 ClientSocket* tcp_sock_; 49 StreamSocket* tcp_sock_;
50 TestCompletionCallback callback_; 50 TestCompletionCallback callback_;
51 scoped_ptr<MockHostResolver> host_resolver_; 51 scoped_ptr<MockHostResolver> host_resolver_;
52 scoped_ptr<SocketDataProvider> data_; 52 scoped_ptr<SocketDataProvider> data_;
53 53
54 private: 54 private:
55 DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocketTest); 55 DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocketTest);
56 }; 56 };
57 57
58 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest() 58 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest()
59 : kNwPort(htons(80)), 59 : kNwPort(htons(80)),
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 EXPECT_TRUE(user_sock_->IsConnected()); 354 EXPECT_TRUE(user_sock_->IsConnected());
355 net_log_.GetEntries(&net_log_entries); 355 net_log_.GetEntries(&net_log_entries);
356 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, 356 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
357 NetLog::TYPE_SOCKS5_CONNECT)); 357 NetLog::TYPE_SOCKS5_CONNECT));
358 } 358 }
359 } 359 }
360 360
361 } // namespace 361 } // namespace
362 362
363 } // namespace net 363 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698