| Index: net/socket/socket_test_util.h
|
| diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
|
| index a4ac158412e86b3e28259acb4760b9c432a32de2..89fc3518690fb639da47df425b80be9797960989 100644
|
| --- a/net/socket/socket_test_util.h
|
| +++ b/net/socket/socket_test_util.h
|
| @@ -52,10 +52,7 @@ class ServerBoundCertService;
|
| class SSLClientSocket;
|
| class StreamSocket;
|
|
|
| -enum IoMode {
|
| - ASYNC,
|
| - SYNCHRONOUS
|
| -};
|
| +enum IoMode { ASYNC, SYNCHRONOUS };
|
|
|
| struct MockConnect {
|
| // Asynchronous connection success.
|
| @@ -84,17 +81,12 @@ struct MockConnect {
|
| // is the data returned from the socket when MockTCPClientSocket::Read() is
|
| // attempted, while |data| in MockWrite is the expected data that should be
|
| // given in MockTCPClientSocket::Write().
|
| -enum MockReadWriteType {
|
| - MOCK_READ,
|
| - MOCK_WRITE
|
| -};
|
| +enum MockReadWriteType { MOCK_READ, MOCK_WRITE };
|
|
|
| template <MockReadWriteType type>
|
| struct MockReadWrite {
|
| // Flag to indicate that the message loop should be terminated.
|
| - enum {
|
| - STOPLOOP = 1 << 31
|
| - };
|
| + enum { STOPLOOP = 1 << 31 };
|
|
|
| // Default
|
| MockReadWrite()
|
| @@ -690,8 +682,8 @@ class MockClientSocket : public SSLClientSocket {
|
| virtual void SetOmniboxSpeculation() OVERRIDE {}
|
|
|
| // SSLClientSocket implementation.
|
| - virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info)
|
| - OVERRIDE;
|
| + virtual void GetSSLCertRequestInfo(
|
| + SSLCertRequestInfo* cert_request_info) OVERRIDE;
|
| virtual int ExportKeyingMaterial(const base::StringPiece& label,
|
| bool has_context,
|
| const base::StringPiece& context,
|
| @@ -949,8 +941,8 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
|
| virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
|
|
|
| // SSLClientSocket implementation.
|
| - virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info)
|
| - OVERRIDE;
|
| + virtual void GetSSLCertRequestInfo(
|
| + SSLCertRequestInfo* cert_request_info) OVERRIDE;
|
| virtual NextProtoStatus GetNextProto(std::string* proto,
|
| std::string* server_protos) OVERRIDE;
|
| virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE;
|
| @@ -1008,7 +1000,7 @@ class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket {
|
| virtual void OnReadComplete(const MockRead& data) OVERRIDE;
|
| virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
|
|
|
| - void set_source_port(int port) { source_port_ = port;}
|
| + void set_source_port(int port) { source_port_ = port; }
|
|
|
| private:
|
| int CompleteRead();
|
|
|