| Index: net/socket/tcp_listen_socket_unittest.h
|
| diff --git a/net/socket/tcp_listen_socket_unittest.h b/net/socket/tcp_listen_socket_unittest.h
|
| index 1bc31a8d1ce0c8b501633ad8b4c4c5f56e390dd9..ce440fe442224b927c78699db176bc8a2a28f33e 100644
|
| --- a/net/socket/tcp_listen_socket_unittest.h
|
| +++ b/net/socket/tcp_listen_socket_unittest.h
|
| @@ -45,8 +45,7 @@ class TCPListenSocketTestAction {
|
| TCPListenSocketTestAction() : action_(ACTION_NONE) {}
|
| explicit TCPListenSocketTestAction(ActionType action) : action_(action) {}
|
| TCPListenSocketTestAction(ActionType action, std::string data)
|
| - : action_(action),
|
| - data_(data) {}
|
| + : action_(action), data_(data) {}
|
|
|
| const std::string data() const { return data_; }
|
| ActionType type() const { return action_; }
|
| @@ -56,13 +55,11 @@ class TCPListenSocketTestAction {
|
| std::string data_;
|
| };
|
|
|
| -
|
| // This had to be split out into a separate class because I couldn't
|
| // make the testing::Test class refcounted.
|
| -class TCPListenSocketTester :
|
| - public StreamListenSocket::Delegate,
|
| - public base::RefCountedThreadSafe<TCPListenSocketTester> {
|
| -
|
| +class TCPListenSocketTester
|
| + : public StreamListenSocket::Delegate,
|
| + public base::RefCountedThreadSafe<TCPListenSocketTester> {
|
| public:
|
| TCPListenSocketTester();
|
|
|
| @@ -92,7 +89,8 @@ class TCPListenSocketTester :
|
| // StreamListenSocket::Delegate:
|
| virtual void DidAccept(StreamListenSocket* server,
|
| scoped_ptr<StreamListenSocket> connection) OVERRIDE;
|
| - virtual void DidRead(StreamListenSocket* connection, const char* data,
|
| + virtual void DidRead(StreamListenSocket* connection,
|
| + const char* data,
|
| int len) OVERRIDE;
|
| virtual void DidClose(StreamListenSocket* sock) OVERRIDE;
|
|
|
|
|