Dispatch encoded_data_length separately in content/child

content/child/resource_dispatcher_unittest.cc

 // Copyright (c) 2012 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/resource_dispatcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 74 matching lines @@
     context_->total_downloaded_data_length += len;
     context_->total_encoded_data_length += encoded_data_length;
   }
 
   void OnReceivedData(std::unique_ptr<ReceivedData> data) override {
     if (context_->cancelled)
       return;
     EXPECT_TRUE(context_->received_response);
     EXPECT_FALSE(context_->complete);
     context_->data.append(data->payload(), data->length());
-    context_->total_encoded_data_length += data->encoded_data_length();
 
     if (context_->cancel_on_receive_data) {
       dispatcher_->Cancel(context_->request_id);
       context_->cancelled = true;
     }
   }
 
+  void OnTransferSizeUpdated(int transfer_size_diff) override {
+    if (context_->cancelled)
+      return;
+    context_->total_encoded_data_length += transfer_size_diff;
+  }
+
   void OnCompletedRequest(int error_code,
                           bool was_ignored_by_handler,
                           bool stale_copy_in_cache,
                           const base::TimeTicks& completion_time,
                           int64_t total_transfer_size,
                           int64_t encoded_body_size) override {
     if (context_->cancelled)
       return;
     EXPECT_TRUE(context_->received_response);
     EXPECT_FALSE(context_->complete);
@@ skipping 420 matching lines @@
 
     void OnReceivedResponse(const ResourceResponseInfo& info) override {
       response_info_ = info;
     }
 
     void OnDownloadedData(int len, int encoded_data_length) override {}
 
     void OnReceivedData(std::unique_ptr<ReceivedData> data) override {
       data_.append(data->payload(), data->length());
     }
+    void OnTransferSizeUpdated(int transfer_size_diff) override {}
 
     void OnCompletedRequest(int error_code,
                             bool was_ignored_by_handler,
                             bool stale_copy_in_cache,
                             const base::TimeTicks& completion_time,
                             int64_t total_transfer_size,
                             int64_t encoded_body_size) override {
       original_peer_->OnReceivedResponse(response_info_);
       if (!data_.empty()) {
-        original_peer_->OnReceivedData(base::MakeUnique<FixedReceivedData>(
-            data_.data(), data_.size(), -1));
+        original_peer_->OnReceivedData(
+            base::MakeUnique<FixedReceivedData>(data_.data(), data_.size()));
       }
       original_peer_->OnCompletedRequest(
           error_code, was_ignored_by_handler, stale_copy_in_cache,
           completion_time, total_transfer_size, encoded_body_size);
     }
 
    private:
     std::unique_ptr<RequestPeer> original_peer_;
     ResourceResponseInfo response_info_;
     std::string data_;
@@ skipping 475 matching lines @@
   ResourceResponseHead response_head;
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 }  // namespace content