| Index: content/child/resource_dispatcher_unittest.cc
|
| diff --git a/content/child/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc
|
| index c13cc1a8bb0580011fc5d2fd28f114e74f6272d7..50b8acdd8f851bfae8674266a50230cb3eb3d70f 100644
|
| --- a/content/child/resource_dispatcher_unittest.cc
|
| +++ b/content/child/resource_dispatcher_unittest.cc
|
| @@ -54,32 +54,32 @@ class TestRequestPeer : public RequestPeer {
|
| bridge_(bridge) {
|
| }
|
|
|
| - virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE {
|
| + virtual void OnUploadProgress(uint64 position, uint64 size) override {
|
| }
|
|
|
| virtual bool OnReceivedRedirect(const net::RedirectInfo& redirect_info,
|
| - const ResourceResponseInfo& info) OVERRIDE {
|
| + const ResourceResponseInfo& info) override {
|
| ++seen_redirects_;
|
| if (defer_on_redirect_)
|
| bridge_->SetDefersLoading(true);
|
| return follow_redirects_;
|
| }
|
|
|
| - virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE {
|
| + virtual void OnReceivedResponse(const ResourceResponseInfo& info) override {
|
| EXPECT_FALSE(received_response_);
|
| received_response_ = true;
|
| if (cancel_on_receive_response_)
|
| bridge_->Cancel();
|
| }
|
|
|
| - virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {
|
| + virtual void OnDownloadedData(int len, int encoded_data_length) override {
|
| total_downloaded_data_length_ += len;
|
| total_encoded_data_length_ += encoded_data_length;
|
| }
|
|
|
| virtual void OnReceivedData(const char* data,
|
| int data_length,
|
| - int encoded_data_length) OVERRIDE {
|
| + int encoded_data_length) override {
|
| EXPECT_TRUE(received_response_);
|
| EXPECT_FALSE(complete_);
|
| data_.append(data, data_length);
|
| @@ -92,7 +92,7 @@ class TestRequestPeer : public RequestPeer {
|
| bool stale_copy_in_cache,
|
| const std::string& security_info,
|
| const base::TimeTicks& completion_time,
|
| - int64 total_transfer_size) OVERRIDE {
|
| + int64 total_transfer_size) override {
|
| EXPECT_TRUE(received_response_);
|
| EXPECT_FALSE(complete_);
|
| complete_ = true;
|
| @@ -164,7 +164,7 @@ class ResourceDispatcherTest : public testing::Test, public IPC::Sender {
|
|
|
| // Emulates IPC send operations (IPC::Sender) by adding
|
| // pending messages to the queue.
|
| - virtual bool Send(IPC::Message* msg) OVERRIDE {
|
| + virtual bool Send(IPC::Message* msg) override {
|
| message_queue_.push_back(IPC::Message(*msg));
|
| delete msg;
|
| return true;
|
| @@ -704,7 +704,7 @@ TEST_F(ResourceDispatcherTest, SerializedPostData) {
|
| class TimeConversionTest : public ResourceDispatcherTest,
|
| public RequestPeer {
|
| public:
|
| - virtual bool Send(IPC::Message* msg) OVERRIDE {
|
| + virtual bool Send(IPC::Message* msg) override {
|
| delete msg;
|
| return true;
|
| }
|
| @@ -718,24 +718,24 @@ class TimeConversionTest : public ResourceDispatcherTest,
|
| }
|
|
|
| // RequestPeer methods.
|
| - virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE {
|
| + virtual void OnUploadProgress(uint64 position, uint64 size) override {
|
| }
|
|
|
| virtual bool OnReceivedRedirect(const net::RedirectInfo& redirect_info,
|
| - const ResourceResponseInfo& info) OVERRIDE {
|
| + const ResourceResponseInfo& info) override {
|
| return true;
|
| }
|
|
|
| - virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE {
|
| + virtual void OnReceivedResponse(const ResourceResponseInfo& info) override {
|
| response_info_ = info;
|
| }
|
|
|
| - virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {
|
| + virtual void OnDownloadedData(int len, int encoded_data_length) override {
|
| }
|
|
|
| virtual void OnReceivedData(const char* data,
|
| int data_length,
|
| - int encoded_data_length) OVERRIDE {
|
| + int encoded_data_length) override {
|
| }
|
|
|
| virtual void OnCompletedRequest(
|
| @@ -744,7 +744,7 @@ class TimeConversionTest : public ResourceDispatcherTest,
|
| bool stale_copy_in_cache,
|
| const std::string& security_info,
|
| const base::TimeTicks& completion_time,
|
| - int64 total_transfer_size) OVERRIDE {
|
| + int64 total_transfer_size) override {
|
| }
|
|
|
| const ResourceResponseInfo& response_info() const { return response_info_; }
|
|
|