diff options
Diffstat (limited to 'jingle')
-rw-r--r-- | jingle/glue/pseudotcp_adapter.cc | 10 | ||||
-rw-r--r-- | jingle/glue/pseudotcp_adapter.h | 2 | ||||
-rw-r--r-- | jingle/notifier/base/fake_ssl_client_socket.cc | 10 | ||||
-rw-r--r-- | jingle/notifier/base/fake_ssl_client_socket.h | 2 | ||||
-rw-r--r-- | jingle/notifier/base/fake_ssl_client_socket_unittest.cc | 2 | ||||
-rw-r--r-- | jingle/notifier/base/proxy_resolving_client_socket.cc | 14 | ||||
-rw-r--r-- | jingle/notifier/base/proxy_resolving_client_socket.h | 2 |
7 files changed, 1 insertions, 41 deletions
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc index b86c805..7136bbc 100644 --- a/jingle/glue/pseudotcp_adapter.cc +++ b/jingle/glue/pseudotcp_adapter.cc @@ -463,14 +463,4 @@ bool PseudoTcpAdapter::UsingTCPFastOpen() const { return false; } -int64 PseudoTcpAdapter::NumBytesRead() const { - DCHECK(CalledOnValidThread()); - return -1; -} - -base::TimeDelta PseudoTcpAdapter::GetConnectTimeMicros() const { - DCHECK(CalledOnValidThread()); - return base::TimeDelta::FromMicroseconds(-1); -} - } // namespace jingle_glue diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h index e53d722..977dcf1 100644 --- a/jingle/glue/pseudotcp_adapter.h +++ b/jingle/glue/pseudotcp_adapter.h @@ -49,8 +49,6 @@ class PseudoTcpAdapter : public net::StreamSocket, base::NonThreadSafe { virtual void SetOmniboxSpeculation() OVERRIDE; virtual bool WasEverUsed() const OVERRIDE; virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual int64 NumBytesRead() const OVERRIDE; - virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE; private: class Core; diff --git a/jingle/notifier/base/fake_ssl_client_socket.cc b/jingle/notifier/base/fake_ssl_client_socket.cc index 20a3f39..8838f13 100644 --- a/jingle/notifier/base/fake_ssl_client_socket.cc +++ b/jingle/notifier/base/fake_ssl_client_socket.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -336,12 +336,4 @@ bool FakeSSLClientSocket::UsingTCPFastOpen() const { return transport_socket_->UsingTCPFastOpen(); } -int64 FakeSSLClientSocket::NumBytesRead() const { - return transport_socket_->NumBytesRead(); -} - -base::TimeDelta FakeSSLClientSocket::GetConnectTimeMicros() const { - return transport_socket_->GetConnectTimeMicros(); -} - } // namespace notifier diff --git a/jingle/notifier/base/fake_ssl_client_socket.h b/jingle/notifier/base/fake_ssl_client_socket.h index 1688b70..f2282c2 100644 --- a/jingle/notifier/base/fake_ssl_client_socket.h +++ b/jingle/notifier/base/fake_ssl_client_socket.h @@ -62,8 +62,6 @@ class FakeSSLClientSocket : public net::StreamSocket { virtual void SetOmniboxSpeculation(); virtual bool WasEverUsed() const; virtual bool UsingTCPFastOpen() const; - virtual int64 NumBytesRead() const; - virtual base::TimeDelta GetConnectTimeMicros() const; private: enum HandshakeState { diff --git a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc index 2fe21b4..6f5c2da 100644 --- a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc +++ b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc @@ -62,8 +62,6 @@ class MockClientSocket : public net::StreamSocket { MOCK_METHOD0(SetOmniboxSpeculation, void()); MOCK_CONST_METHOD0(WasEverUsed, bool()); MOCK_CONST_METHOD0(UsingTCPFastOpen, bool()); - MOCK_CONST_METHOD0(NumBytesRead, int64()); - MOCK_CONST_METHOD0(GetConnectTimeMicros, base::TimeDelta()); }; // Break up |data| into a bunch of chunked MockReads/Writes and push diff --git a/jingle/notifier/base/proxy_resolving_client_socket.cc b/jingle/notifier/base/proxy_resolving_client_socket.cc index 4deda20..e34ca1c 100644 --- a/jingle/notifier/base/proxy_resolving_client_socket.cc +++ b/jingle/notifier/base/proxy_resolving_client_socket.cc @@ -342,20 +342,6 @@ bool ProxyResolvingClientSocket::UsingTCPFastOpen() const { return false; } -int64 ProxyResolvingClientSocket::NumBytesRead() const { - if (transport_.get() && transport_->socket()) - return transport_->socket()->NumBytesRead(); - NOTREACHED(); - return -1; -} - -base::TimeDelta ProxyResolvingClientSocket::GetConnectTimeMicros() const { - if (transport_.get() && transport_->socket()) - return transport_->socket()->GetConnectTimeMicros(); - NOTREACHED(); - return base::TimeDelta::FromMicroseconds(-1); -} - void ProxyResolvingClientSocket::CloseTransportSocket() { if (transport_.get() && transport_->socket()) transport_->socket()->Disconnect(); diff --git a/jingle/notifier/base/proxy_resolving_client_socket.h b/jingle/notifier/base/proxy_resolving_client_socket.h index b97315b..8e95f87 100644 --- a/jingle/notifier/base/proxy_resolving_client_socket.h +++ b/jingle/notifier/base/proxy_resolving_client_socket.h @@ -56,8 +56,6 @@ class ProxyResolvingClientSocket : public net::StreamSocket { virtual void SetOmniboxSpeculation() OVERRIDE; virtual bool WasEverUsed() const OVERRIDE; virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual int64 NumBytesRead() const OVERRIDE; - virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE; private: // Proxy resolution and connection functions. |