From 97693d1048d4050572920680d1f1aaa976e61546 Mon Sep 17 00:00:00 2001 From: "rch@chromium.org" Date: Fri, 16 Nov 2012 16:05:00 +0000 Subject: Make QuicConnectionHelper::GetClock() const and return a const QuicClock *. Merge internal change 38789850. Review URL: https://chromiumcodereview.appspot.com/11365278 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168208 0039d316-1c4b-4281-b951-d872f2087c98 --- net/quic/quic_connection.h | 4 ++-- net/quic/quic_connection_helper.cc | 10 +++++----- net/quic/quic_connection_helper.h | 6 +++--- net/quic/quic_connection_test.cc | 2 +- net/quic/test_tools/quic_test_utils.cc | 2 +- net/quic/test_tools/quic_test_utils.h | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'net') diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h index 369bfc0..6abdab3 100644 --- a/net/quic/quic_connection.h +++ b/net/quic/quic_connection.h @@ -67,7 +67,7 @@ class NET_EXPORT_PRIVATE QuicConnectionHelperInterface { virtual void SetConnection(QuicConnection* connection) = 0; // Returns a QuicClock to be used for all time related functions. - virtual QuicClock* GetClock() = 0; + virtual const QuicClock* GetClock() const = 0; // Sends the packet out to the peer, possibly simulating packet // loss if FLAGS_fake_packet_loss_percentage is set. If the write failed @@ -255,7 +255,7 @@ class NET_EXPORT_PRIVATE QuicConnection : public QuicFramerVisitorInterface { scoped_ptr helper_; QuicFramer framer_; - QuicClock* clock_; + const QuicClock* clock_; QuicGuid guid_; IPEndPoint self_address_; diff --git a/net/quic/quic_connection_helper.cc b/net/quic/quic_connection_helper.cc index afa3590..49401f4 100644 --- a/net/quic/quic_connection_helper.cc +++ b/net/quic/quic_connection_helper.cc @@ -16,7 +16,7 @@ namespace net { QuicConnectionHelper::QuicConnectionHelper(base::TaskRunner* task_runner, - QuicClock* clock, + const QuicClock* clock, DatagramClientSocket* socket) : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), task_runner_(task_runner), @@ -33,7 +33,7 @@ void QuicConnectionHelper::SetConnection(QuicConnection* connection) { connection_ = connection; } -QuicClock* QuicConnectionHelper::GetClock() { +const QuicClock* QuicConnectionHelper::GetClock() const { return clock_; } @@ -49,9 +49,9 @@ int QuicConnectionHelper::WritePacketToWire( scoped_refptr buf( new StringIOBuffer(std::string(packet.data(), packet.length()))); - return socket_->Write(buf, packet.length(), - base::Bind(&QuicConnectionHelper::OnWriteComplete, - weak_factory_.GetWeakPtr())); + return socket_->Write(buf, packet.length(), + base::Bind(&QuicConnectionHelper::OnWriteComplete, + weak_factory_.GetWeakPtr())); } void QuicConnectionHelper::SetResendAlarm( diff --git a/net/quic/quic_connection_helper.h b/net/quic/quic_connection_helper.h index 022f090..448976b 100644 --- a/net/quic/quic_connection_helper.h +++ b/net/quic/quic_connection_helper.h @@ -29,14 +29,14 @@ class NET_EXPORT_PRIVATE QuicConnectionHelper : public QuicConnectionHelperInterface { public: QuicConnectionHelper(base::TaskRunner* task_runner, - QuicClock* clock, + const QuicClock* clock, DatagramClientSocket* socket); virtual ~QuicConnectionHelper(); // QuicConnectionHelperInterface virtual void SetConnection(QuicConnection* connection) OVERRIDE; - virtual QuicClock* GetClock() OVERRIDE; + virtual const QuicClock* GetClock() const OVERRIDE; virtual int WritePacketToWire(const QuicEncryptedPacket& packet, int* error) OVERRIDE; virtual void SetResendAlarm(QuicPacketSequenceNumber sequence_number, @@ -66,7 +66,7 @@ class NET_EXPORT_PRIVATE QuicConnectionHelper base::TaskRunner* task_runner_; DatagramClientSocket* socket_; QuicConnection* connection_; - QuicClock* clock_; + const QuicClock* clock_; bool send_alarm_registered_; bool timeout_alarm_registered_; diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc index 8f9094d..cda67e8 100644 --- a/net/quic/quic_connection_test.cc +++ b/net/quic/quic_connection_test.cc @@ -83,7 +83,7 @@ class TestConnectionHelper : public QuicConnectionHelperInterface { // QuicConnectionHelperInterface virtual void SetConnection(QuicConnection* connection) {} - virtual QuicClock* GetClock() { + virtual const QuicClock* GetClock() const { return clock_; } diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc index 1a08893..0fb409e 100644 --- a/net/quic/test_tools/quic_test_utils.cc +++ b/net/quic/test_tools/quic_test_utils.cc @@ -43,7 +43,7 @@ MockHelper::MockHelper() { MockHelper::~MockHelper() { } -QuicClock* MockHelper::GetClock() { +const QuicClock* MockHelper::GetClock() const { return &clock_; } diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h index 8ae5582..c9ab703 100644 --- a/net/quic/test_tools/quic_test_utils.h +++ b/net/quic/test_tools/quic_test_utils.h @@ -118,7 +118,7 @@ class MockHelper : public QuicConnectionHelperInterface { virtual ~MockHelper(); MOCK_METHOD1(SetConnection, void(QuicConnection* connection)); - QuicClock* GetClock(); + const QuicClock* GetClock() const; MOCK_METHOD2(WritePacketToWire, int(const QuicEncryptedPacket& packet, int* error)); MOCK_METHOD2(SetResendAlarm, void(QuicPacketSequenceNumber sequence_number, @@ -128,7 +128,7 @@ class MockHelper : public QuicConnectionHelperInterface { MOCK_METHOD0(IsSendAlarmSet, bool()); MOCK_METHOD0(UnregisterSendAlarmIfRegistered, void()); private: - MockClock clock_; + const MockClock clock_; }; class MockConnection : public QuicConnection { -- cgit v1.1