Render process changes for ResourceTiming sizes.

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 13 matching lines @@
 #include "content/child/request_extra_data.h"
 #include "content/child/request_info.h"
 #include "content/common/appcache_interfaces.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_request.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/child/fixed_received_data.h"
 #include "content/public/child/request_peer.h"
 #include "content/public/child/resource_dispatcher_delegate.h"
-#include "content/public/common/content_features.cc"
+#include "content/public/common/content_features.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 static const char kTestPageUrl[] = "http://www.google.com/";
 static const char kTestPageHeaders[] =
   "HTTP/1.1 200 OK\nContent-Type:text/html\n\n";
@@ skipping 38 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_length();
+    context_->total_encoded_data_length += data->encoded_data_length();
   }
 
   void OnCompletedRequest(int error_code,
                           bool was_ignored_by_handler,
                           bool stale_copy_in_cache,
                           const std::string& security_info,
                           const base::TimeTicks& completion_time,
                           int64_t total_transfer_size) override {
     if (context_->cancelled)
       return;
@@ skipping 179 matching lines @@
 
   void NotifyInlinedDataChunkReceived(int request_id,
                                       const std::vector<char>& data) {
     auto size = data.size();
     EXPECT_TRUE(dispatcher_->OnMessageReceived(
         ResourceMsg_InlinedDataChunkReceived(request_id, data, size, size)));
   }
 
   void NotifyDataDownloaded(int request_id,
                             int decoded_length,
-                            int encoded_length) {
+                            int encoded_data_length) {
     EXPECT_TRUE(dispatcher_->OnMessageReceived(ResourceMsg_DataDownloaded(
-        request_id, decoded_length, encoded_length)));
+        request_id, decoded_length, encoded_data_length)));
   }
 
   void NotifyRequestComplete(int request_id, size_t total_size) {
     ResourceRequestCompletionStatus request_complete_data;
     request_complete_data.error_code = net::OK;
     request_complete_data.was_ignored_by_handler = false;
     request_complete_data.exists_in_cache = false;
     request_complete_data.encoded_data_length = total_size;
     EXPECT_TRUE(dispatcher_->OnMessageReceived(
         ResourceMsg_RequestComplete(request_id, request_complete_data)));
@@ skipping 237 matching lines @@
     }
 
     void OnCompletedRequest(int error_code,
                             bool was_ignored_by_handler,
                             bool stale_copy_in_cache,
                             const std::string& security_info,
                             const base::TimeTicks& completion_time,
                             int64_t total_transfer_size) override {
       original_peer_->OnReceivedResponse(response_info_);
       if (!data_.empty()) {
-        original_peer_->OnReceivedData(base::WrapUnique(
-            new FixedReceivedData(data_.data(), data_.size(), -1)));
+        original_peer_->OnReceivedData(base::WrapUnique(new FixedReceivedData(
+            data_.data(), data_.size(), -1, data_.size())));
       }
       original_peer_->OnCompletedRequest(error_code, was_ignored_by_handler,
                                          stale_copy_in_cache, security_info,
                                          completion_time, total_transfer_size);
     }
 
    private:
     std::unique_ptr<RequestPeer> original_peer_;
     ResourceResponseInfo response_info_;
     std::string data_;
@@ skipping 251 matching lines @@
   const int kEncodedIncrement = 50;
 
   int id = ConsumeRequestResource();
   EXPECT_EQ(0u, queued_messages());
 
   NotifyReceivedResponse(id);
   EXPECT_EQ(0u, queued_messages());
   EXPECT_TRUE(peer_context.received_response);
 
   int expected_total_downloaded_length = 0;
-  int expected_total_encoded_length = 0;
+  int expected_total_encoded_data_length = 0;
   for (int i = 0; i < 10; ++i) {
     NotifyDataDownloaded(id, kDownloadedIncrement, kEncodedIncrement);
     ConsumeDataDownloaded_ACK(id);
     expected_total_downloaded_length += kDownloadedIncrement;
-    expected_total_encoded_length += kEncodedIncrement;
+    expected_total_encoded_data_length += kEncodedIncrement;
     EXPECT_EQ(expected_total_downloaded_length,
               peer_context.total_downloaded_data_length);
-    EXPECT_EQ(expected_total_encoded_length,
+    EXPECT_EQ(expected_total_encoded_data_length,
               peer_context.total_encoded_data_length);
   }
 
   NotifyRequestComplete(id, strlen(kTestPageContents));
   EXPECT_EQ("", peer_context.data);
   EXPECT_TRUE(peer_context.complete);
   EXPECT_EQ(0u, queued_messages());
 
   dispatcher()->RemovePendingRequest(request_id);
   ConsumeReleaseDownloadedFile(id);
   EXPECT_EQ(0u, queued_messages());
   EXPECT_EQ(expected_total_downloaded_length,
             peer_context.total_downloaded_data_length);
-  EXPECT_EQ(expected_total_encoded_length,
+  EXPECT_EQ(expected_total_encoded_data_length,
             peer_context.total_encoded_data_length);
 }
 
 // Make sure that when a download to file is cancelled, the file is destroyed.
 TEST_F(ResourceDispatcherTest, CancelDownloadToFile) {
   std::unique_ptr<RequestInfo> request_info(CreateRequestInfo(true));
   TestRequestPeer::Context peer_context;
   int request_id = StartAsync(*request_info.get(), NULL, &peer_context);
 
   int id = ConsumeRequestResource();
@@ skipping 75 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