| Index: net/socket_stream/socket_stream_unittest.cc
|
| diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc
|
| index 069f92eb9ed53bd2fa2e7168eacd48ebfe920e34..7c4b50ef20adc86a7ecde8a0ec97e45fa1443c65 100644
|
| --- a/net/socket_stream/socket_stream_unittest.cc
|
| +++ b/net/socket_stream/socket_stream_unittest.cc
|
| @@ -90,7 +90,7 @@ class SocketStreamEventRecorder : public SocketStream::Delegate {
|
|
|
| virtual int OnStartOpenConnection(
|
| SocketStream* socket,
|
| - const CompletionCallback& callback) OVERRIDE {
|
| + const CompletionCallback& callback) override {
|
| connection_callback_ = callback;
|
| events_.push_back(
|
| SocketStreamEvent(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
|
| @@ -100,7 +100,7 @@ class SocketStreamEventRecorder : public SocketStream::Delegate {
|
| return OK;
|
| }
|
| virtual void OnConnected(SocketStream* socket,
|
| - int num_pending_send_allowed) OVERRIDE {
|
| + int num_pending_send_allowed) override {
|
| events_.push_back(
|
| SocketStreamEvent(SocketStreamEvent::EVENT_CONNECTED,
|
| socket, num_pending_send_allowed, std::string(),
|
| @@ -109,7 +109,7 @@ class SocketStreamEventRecorder : public SocketStream::Delegate {
|
| on_connected_.Run(&events_.back());
|
| }
|
| virtual void OnSentData(SocketStream* socket,
|
| - int amount_sent) OVERRIDE {
|
| + int amount_sent) override {
|
| events_.push_back(
|
| SocketStreamEvent(SocketStreamEvent::EVENT_SENT_DATA, socket,
|
| amount_sent, std::string(), NULL, OK));
|
| @@ -117,14 +117,14 @@ class SocketStreamEventRecorder : public SocketStream::Delegate {
|
| on_sent_data_.Run(&events_.back());
|
| }
|
| virtual void OnReceivedData(SocketStream* socket,
|
| - const char* data, int len) OVERRIDE {
|
| + const char* data, int len) override {
|
| events_.push_back(
|
| SocketStreamEvent(SocketStreamEvent::EVENT_RECEIVED_DATA, socket, len,
|
| std::string(data, len), NULL, OK));
|
| if (!on_received_data_.is_null())
|
| on_received_data_.Run(&events_.back());
|
| }
|
| - virtual void OnClose(SocketStream* socket) OVERRIDE {
|
| + virtual void OnClose(SocketStream* socket) override {
|
| events_.push_back(
|
| SocketStreamEvent(SocketStreamEvent::EVENT_CLOSE, socket, 0,
|
| std::string(), NULL, OK));
|
| @@ -134,14 +134,14 @@ class SocketStreamEventRecorder : public SocketStream::Delegate {
|
| callback_.Run(OK);
|
| }
|
| virtual void OnAuthRequired(SocketStream* socket,
|
| - AuthChallengeInfo* auth_info) OVERRIDE {
|
| + AuthChallengeInfo* auth_info) override {
|
| events_.push_back(
|
| SocketStreamEvent(SocketStreamEvent::EVENT_AUTH_REQUIRED, socket, 0,
|
| std::string(), auth_info, OK));
|
| if (!on_auth_required_.is_null())
|
| on_auth_required_.Run(&events_.back());
|
| }
|
| - virtual void OnError(const SocketStream* socket, int error) OVERRIDE {
|
| + virtual void OnError(const SocketStream* socket, int error) override {
|
| events_.push_back(
|
| SocketStreamEvent(SocketStreamEvent::EVENT_ERROR, NULL, 0,
|
| std::string(), NULL, error));
|
| @@ -198,7 +198,7 @@ class SelfDeletingDelegate : public SocketStream::Delegate {
|
| virtual ~SelfDeletingDelegate() {}
|
|
|
| // Call DetachDelegate(), delete |this|, then run the callback.
|
| - virtual void OnError(const SocketStream* socket, int error) OVERRIDE {
|
| + virtual void OnError(const SocketStream* socket, int error) override {
|
| // callback_ will be deleted when we delete |this|, so copy it to call it
|
| // afterwards.
|
| CompletionCallback callback = callback_;
|
| @@ -215,17 +215,17 @@ class SelfDeletingDelegate : public SocketStream::Delegate {
|
| }
|
|
|
| virtual void OnConnected(SocketStream* socket, int max_pending_send_allowed)
|
| - OVERRIDE {
|
| + override {
|
| ADD_FAILURE() << "OnConnected() should not be called";
|
| }
|
| - virtual void OnSentData(SocketStream* socket, int amount_sent) OVERRIDE {
|
| + virtual void OnSentData(SocketStream* socket, int amount_sent) override {
|
| ADD_FAILURE() << "OnSentData() should not be called";
|
| }
|
| virtual void OnReceivedData(SocketStream* socket, const char* data, int len)
|
| - OVERRIDE {
|
| + override {
|
| ADD_FAILURE() << "OnReceivedData() should not be called";
|
| }
|
| - virtual void OnClose(SocketStream* socket) OVERRIDE {
|
| + virtual void OnClose(SocketStream* socket) override {
|
| ADD_FAILURE() << "OnClose() should not be called";
|
| }
|
|
|
| @@ -254,7 +254,7 @@ class TestSocketStreamNetworkDelegate : public TestNetworkDelegate {
|
|
|
| virtual int OnBeforeSocketStreamConnect(
|
| SocketStream* stream,
|
| - const CompletionCallback& callback) OVERRIDE {
|
| + const CompletionCallback& callback) override {
|
| return before_connect_result_;
|
| }
|
|
|
|
|