From 5f49336067c0871355aaa72af45771fa8d8e4cca Mon Sep 17 00:00:00 2001 From: "jschuh@chromium.org" Date: Sat, 5 Apr 2014 13:11:54 +0000 Subject: Revert 261966 "make SetReceiveBufferSize and SetSendBufferSize r..." Appears to have broken the following gcm_unit_tests on Mac: DeviceCredentials AckOnLogin AckWhenLimitReachedWithHeartbeat ExpiredTTLOnRestart InitializeExisting SendMessageRMQAckOnReconnect SendMessageRMQOnRestart SendMessageRMQPartialAckOnReconnect SendMessageRMQWithStreamAck http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%284%29/builds/39860 > make SetReceiveBufferSize and SetSendBufferSize return net error codes (instead of bools) > > TBR=sergeyu,yzshen > R=wtc > BUG=355222 > > Review URL: https://codereview.chromium.org/217573002 TBR=jar@chromium.org Review URL: https://codereview.chromium.org/227083002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262002 0039d316-1c4b-4281-b951-d872f2087c98 --- jingle/glue/channel_socket_adapter.cc | 10 ++++------ jingle/glue/channel_socket_adapter.h | 4 ++-- jingle/glue/fake_ssl_client_socket.cc | 4 ++-- jingle/glue/fake_ssl_client_socket.h | 4 ++-- jingle/glue/fake_ssl_client_socket_unittest.cc | 4 ++-- jingle/glue/proxy_resolving_client_socket.cc | 8 ++++---- jingle/glue/proxy_resolving_client_socket.h | 4 ++-- jingle/glue/pseudotcp_adapter.cc | 8 ++++---- jingle/glue/pseudotcp_adapter.h | 4 ++-- jingle/glue/pseudotcp_adapter_unittest.cc | 8 ++++---- 10 files changed, 28 insertions(+), 30 deletions(-) (limited to 'jingle') diff --git a/jingle/glue/channel_socket_adapter.cc b/jingle/glue/channel_socket_adapter.cc index bca4222..40ed12c 100644 --- a/jingle/glue/channel_socket_adapter.cc +++ b/jingle/glue/channel_socket_adapter.cc @@ -99,16 +99,14 @@ int TransportChannelSocketAdapter::Write( return result; } -int TransportChannelSocketAdapter::SetReceiveBufferSize(int32 size) { +bool TransportChannelSocketAdapter::SetReceiveBufferSize(int32 size) { DCHECK_EQ(base::MessageLoop::current(), message_loop_); - return (channel_->SetOption(talk_base::Socket::OPT_RCVBUF, size) == 0) ? - net::OK : net::ERR_SOCKET_SET_RECEIVE_BUFFER_SIZE_ERROR; + return channel_->SetOption(talk_base::Socket::OPT_RCVBUF, size) == 0; } -int TransportChannelSocketAdapter::SetSendBufferSize(int32 size) { +bool TransportChannelSocketAdapter::SetSendBufferSize(int32 size) { DCHECK_EQ(base::MessageLoop::current(), message_loop_); - return (channel_->SetOption(talk_base::Socket::OPT_SNDBUF, size) == 0) ? - net::OK : net::ERR_SOCKET_SET_SEND_BUFFER_SIZE_ERROR; + return channel_->SetOption(talk_base::Socket::OPT_SNDBUF, size) == 0; } void TransportChannelSocketAdapter::Close(int error_code) { diff --git a/jingle/glue/channel_socket_adapter.h b/jingle/glue/channel_socket_adapter.h index fc90df9..35414a1 100644 --- a/jingle/glue/channel_socket_adapter.h +++ b/jingle/glue/channel_socket_adapter.h @@ -48,8 +48,8 @@ class TransportChannelSocketAdapter : public net::Socket, virtual int Write(net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; private: void OnNewPacket(cricket::TransportChannel* channel, diff --git a/jingle/glue/fake_ssl_client_socket.cc b/jingle/glue/fake_ssl_client_socket.cc index 4cc6867..9d722c7 100644 --- a/jingle/glue/fake_ssl_client_socket.cc +++ b/jingle/glue/fake_ssl_client_socket.cc @@ -103,11 +103,11 @@ int FakeSSLClientSocket::Write(net::IOBuffer* buf, int buf_len, return transport_socket_->Write(buf, buf_len, callback); } -int FakeSSLClientSocket::SetReceiveBufferSize(int32 size) { +bool FakeSSLClientSocket::SetReceiveBufferSize(int32 size) { return transport_socket_->SetReceiveBufferSize(size); } -int FakeSSLClientSocket::SetSendBufferSize(int32 size) { +bool FakeSSLClientSocket::SetSendBufferSize(int32 size) { return transport_socket_->SetSendBufferSize(size); } diff --git a/jingle/glue/fake_ssl_client_socket.h b/jingle/glue/fake_ssl_client_socket.h index 41000f7..54a9e2f 100644 --- a/jingle/glue/fake_ssl_client_socket.h +++ b/jingle/glue/fake_ssl_client_socket.h @@ -49,8 +49,8 @@ class FakeSSLClientSocket : public net::StreamSocket { const net::CompletionCallback& callback) OVERRIDE; virtual int Write(net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; virtual int Connect(const net::CompletionCallback& callback) OVERRIDE; virtual void Disconnect() OVERRIDE; virtual bool IsConnected() const OVERRIDE; diff --git a/jingle/glue/fake_ssl_client_socket_unittest.cc b/jingle/glue/fake_ssl_client_socket_unittest.cc index a2981eb..f6d8fea 100644 --- a/jingle/glue/fake_ssl_client_socket_unittest.cc +++ b/jingle/glue/fake_ssl_client_socket_unittest.cc @@ -50,8 +50,8 @@ class MockClientSocket : public net::StreamSocket { const net::CompletionCallback&)); MOCK_METHOD3(Write, int(net::IOBuffer*, int, const net::CompletionCallback&)); - MOCK_METHOD1(SetReceiveBufferSize, int(int32)); - MOCK_METHOD1(SetSendBufferSize, int(int32)); + MOCK_METHOD1(SetReceiveBufferSize, bool(int32)); + MOCK_METHOD1(SetSendBufferSize, bool(int32)); MOCK_METHOD1(Connect, int(const net::CompletionCallback&)); MOCK_METHOD0(Disconnect, void()); MOCK_CONST_METHOD0(IsConnected, bool()); diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index f88f715..6216906 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -107,18 +107,18 @@ int ProxyResolvingClientSocket::Write( return net::ERR_SOCKET_NOT_CONNECTED; } -int ProxyResolvingClientSocket::SetReceiveBufferSize(int32 size) { +bool ProxyResolvingClientSocket::SetReceiveBufferSize(int32 size) { if (transport_.get() && transport_->socket()) return transport_->socket()->SetReceiveBufferSize(size); NOTREACHED(); - return net::ERR_SOCKET_NOT_CONNECTED; + return false; } -int ProxyResolvingClientSocket::SetSendBufferSize(int32 size) { +bool ProxyResolvingClientSocket::SetSendBufferSize(int32 size) { if (transport_.get() && transport_->socket()) return transport_->socket()->SetSendBufferSize(size); NOTREACHED(); - return net::ERR_SOCKET_NOT_CONNECTED; + return false; } int ProxyResolvingClientSocket::Connect( diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h index 58bbdba4..99824d0 100644 --- a/jingle/glue/proxy_resolving_client_socket.h +++ b/jingle/glue/proxy_resolving_client_socket.h @@ -52,8 +52,8 @@ class ProxyResolvingClientSocket : public net::StreamSocket { const net::CompletionCallback& callback) OVERRIDE; virtual int Write(net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; virtual int Connect(const net::CompletionCallback& callback) OVERRIDE; virtual void Disconnect() OVERRIDE; virtual bool IsConnected() const OVERRIDE; diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc index cdb44a0..afd6c36 100644 --- a/jingle/glue/pseudotcp_adapter.cc +++ b/jingle/glue/pseudotcp_adapter.cc @@ -484,18 +484,18 @@ int PseudoTcpAdapter::Write(net::IOBuffer* buffer, int buffer_size, return core_->Write(buffer, buffer_size, callback); } -int PseudoTcpAdapter::SetReceiveBufferSize(int32 size) { +bool PseudoTcpAdapter::SetReceiveBufferSize(int32 size) { DCHECK(CalledOnValidThread()); core_->SetReceiveBufferSize(size); - return net::OK; + return false; } -int PseudoTcpAdapter::SetSendBufferSize(int32 size) { +bool PseudoTcpAdapter::SetSendBufferSize(int32 size) { DCHECK(CalledOnValidThread()); core_->SetSendBufferSize(size); - return net::OK; + return false; } int PseudoTcpAdapter::Connect(const net::CompletionCallback& callback) { diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h index e3e9419..63764c4 100644 --- a/jingle/glue/pseudotcp_adapter.h +++ b/jingle/glue/pseudotcp_adapter.h @@ -34,8 +34,8 @@ class PseudoTcpAdapter : public net::StreamSocket, base::NonThreadSafe { const net::CompletionCallback& callback) OVERRIDE; virtual int Write(net::IOBuffer* buffer, int buffer_size, const net::CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; // net::StreamSocket implementation. virtual int Connect(const net::CompletionCallback& callback) OVERRIDE; diff --git a/jingle/glue/pseudotcp_adapter_unittest.cc b/jingle/glue/pseudotcp_adapter_unittest.cc index e2329f8..7d1870c 100644 --- a/jingle/glue/pseudotcp_adapter_unittest.cc +++ b/jingle/glue/pseudotcp_adapter_unittest.cc @@ -142,13 +142,13 @@ class FakeSocket : public net::Socket { return buf_len; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE { NOTIMPLEMENTED(); - return net::ERR_NOT_IMPLEMENTED; + return false; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { + virtual bool SetSendBufferSize(int32 size) OVERRIDE { NOTIMPLEMENTED(); - return net::ERR_NOT_IMPLEMENTED; + return false; } private: -- cgit v1.1