Send the decoded size when response completed and stop summing in ResourceLoader::DidReceiveData()

content/child/web_url_loader_impl_unittest.cc

 // Copyright 2014 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.
 
 #include "content/child/web_url_loader_impl.h"
 
 #include <stdint.h>
 #include <string.h>
 
 #include <utility>
@@ skipping 175 matching lines @@
     EXPECT_EQ("", error_.domain.Utf8());
 
     received_data_.append(data, dataLength);
 
     if (delete_on_receive_data_)
       loader_.reset();
   }
 
   void DidFinishLoading(double finishTime,
                         int64_t totalEncodedDataLength,
-                        int64_t totalEncodedBodyLength) override {
+                        int64_t totalEncodedBodyLength,
+                        int64_t totalDecodedBodyLength) override {
     EXPECT_TRUE(loader_);
     EXPECT_TRUE(did_receive_response_);
     EXPECT_FALSE(did_finish_);
     did_finish_ = true;
 
     if (delete_on_finish_)
       loader_.reset();
   }
 
   void DidFail(const blink::WebURLError& error,
                int64_t totalEncodedDataLength,
-               int64_t totalEncodedBodyLength) override {
+               int64_t totalEncodedBodyLength,
+               int64_t totalDecodedBodyLength) override {
     EXPECT_TRUE(loader_);
     EXPECT_FALSE(did_finish_);
     error_ = error;
 
     if (delete_on_fail_)
       loader_.reset();
   }
 
   WebURLLoaderImpl* loader() { return loader_.get(); }
   void DeleteLoader() {
@@ skipping 97 matching lines @@
     EXPECT_EQ("", client()->received_data());
     auto size = strlen(kTestData);
     peer()->OnReceivedData(
         base::MakeUnique<FixedReceivedData>(kTestData, size));
     EXPECT_EQ(kTestData, client()->received_data());
   }
 
   void DoCompleteRequest() {
     EXPECT_FALSE(client()->did_finish());
     peer()->OnCompletedRequest(net::OK, false, false, base::TimeTicks(),
-                               strlen(kTestData), strlen(kTestData));
+                               strlen(kTestData), strlen(kTestData),
+                               strlen(kTestData));
     EXPECT_TRUE(client()->did_finish());
     // There should be no error.
     EXPECT_EQ(net::OK, client()->error().reason);
     EXPECT_EQ("", client()->error().domain.Utf8());
   }
 
   void DoFailRequest() {
     EXPECT_FALSE(client()->did_finish());
     peer()->OnCompletedRequest(net::ERR_FAILED, false, false, base::TimeTicks(),
-                               strlen(kTestData), strlen(kTestData));
+                               strlen(kTestData), strlen(kTestData),
+                               strlen(kTestData));
     EXPECT_FALSE(client()->did_finish());
     EXPECT_EQ(net::ERR_FAILED, client()->error().reason);
     EXPECT_EQ(net::kErrorDomain, client()->error().domain.Utf8());
   }
 
   void DoReceiveResponseFtp() {
     EXPECT_FALSE(client()->did_receive_response());
     content::ResourceResponseInfo response_info;
     response_info.mime_type = kFtpDirMimeType;
     peer()->OnReceivedResponse(response_info);
@@ skipping 219 matching lines @@
 
 TEST_F(WebURLLoaderImplTest, FtpDeleteOnReceiveMoreData) {
   DoStartAsyncRequest();
   DoReceiveResponseFtp();
   DoReceiveDataFtp();
 
   // Directory listings are only parsed once the request completes, so this will
   // cancel in DoReceiveDataFtp, before the request finishes.
   client()->set_delete_on_receive_data();
   peer()->OnCompletedRequest(net::OK, false, false, base::TimeTicks(),
-                             strlen(kTestData), strlen(kTestData));
+                             strlen(kTestData), strlen(kTestData),
+                             strlen(kTestData));
   EXPECT_FALSE(client()->did_finish());
 }
 
 TEST_F(WebURLLoaderImplTest, FtpDeleteOnFinish) {
   client()->set_delete_on_finish();
   DoStartAsyncRequest();
   DoReceiveResponseFtp();
   DoReceiveDataFtp();
   DoCompleteRequest();
 }
@@ skipping 100 matching lines @@
   int64_t encoded_body_length = 0;
   client()->loader()->LoadSynchronously(
       request, response, error, data, encoded_data_length, encoded_body_length);
 
   EXPECT_EQ(kEncodedBodyLength, encoded_body_length);
   EXPECT_EQ(kEncodedDataLength, encoded_data_length);
 }
 
 }  // namespace
 }  // namespace content