Revert of Send encoded_body_length to renderer when response completed (1/3)

content/browser/loader/async_resource_handler_unittest.cc

 // Copyright 2016 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/browser/loader/async_resource_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 #include <string>
@@ skipping 46 matching lines @@
 namespace {
 
 std::string GenerateHeader(size_t response_data_size) {
   return base::StringPrintf(
       "HTTP/1.1 200 OK\n"
       "Content-type: text/html\n"
       "Content-Length: %" PRIuS "\n",
       response_data_size);
 }
 
-int64_t TotalReceivedBytes(size_t response_data_size) {
-  return response_data_size + GenerateHeader(response_data_size).size();
-}
-
 std::string GenerateData(size_t response_data_size) {
   return std::string(response_data_size, 'a');
 }
 
 class TestProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   TestProtocolHandler(size_t response_data_size)
       : response_data_size_(response_data_size) {}
 
   net::URLRequestJob* MaybeCreateJob(
@@ skipping 164 matching lines @@
   std::unique_ptr<base::RunLoop> finish_waiter_;
 };
 
 TEST_F(AsyncResourceHandlerTest, Construct) {
   CreateRequestWithResponseDataSize(1);
 }
 
 TEST_F(AsyncResourceHandlerTest, OneChunkLengths) {
   // Larger than kInlinedLeadingChunkSize and smaller than
   // kMaxAllocationSize.
-  constexpr auto kDataSize = 4096;
-  StartRequestAndWaitWithResponseDataSize(kDataSize);
+  StartRequestAndWaitWithResponseDataSize(4096);
   const auto& messages = filter_->messages();
   ASSERT_EQ(4u, messages.size());
   ASSERT_EQ(ResourceMsg_DataReceived::ID, messages[2]->type());
   ResourceMsg_DataReceived::Param params;
   ResourceMsg_DataReceived::Read(messages[2].get(), &params);
 
   int encoded_data_length = std::get<3>(params);
-  EXPECT_EQ(kDataSize, encoded_data_length);
+  EXPECT_EQ(4096, encoded_data_length);
   int encoded_body_length = std::get<4>(params);
-  EXPECT_EQ(kDataSize, encoded_body_length);
-
-  ASSERT_EQ(ResourceMsg_RequestComplete::ID, messages[3]->type());
-  ResourceMsg_RequestComplete::Param completion_params;
-  ResourceMsg_RequestComplete::Read(messages[3].get(), &completion_params);
-  ResourceRequestCompletionStatus completion_status =
-      std::get<1>(completion_params);
-
-  EXPECT_EQ(TotalReceivedBytes(kDataSize),
-            completion_status.encoded_data_length);
-  EXPECT_EQ(kDataSize, completion_status.encoded_body_length);
+  EXPECT_EQ(4096, encoded_body_length);
 }
 
 TEST_F(AsyncResourceHandlerTest, InlinedChunkLengths) {
   // TODO(ricea): Remove this Feature-enabling code once the feature is on by
   // default.
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
       features::kOptimizeLoadingIPCForSmallResources);
 
   // Smaller than kInlinedLeadingChunkSize.
-  constexpr auto kDataSize = 8;
-  StartRequestAndWaitWithResponseDataSize(kDataSize);
+  StartRequestAndWaitWithResponseDataSize(8);
   const auto& messages = filter_->messages();
   ASSERT_EQ(3u, messages.size());
   ASSERT_EQ(ResourceMsg_InlinedDataChunkReceived::ID, messages[1]->type());
   ResourceMsg_InlinedDataChunkReceived::Param params;
   ResourceMsg_InlinedDataChunkReceived::Read(messages[1].get(), &params);
 
   int encoded_data_length = std::get<2>(params);
-  EXPECT_EQ(kDataSize, encoded_data_length);
+  EXPECT_EQ(8, encoded_data_length);
   int encoded_body_length = std::get<3>(params);
-  EXPECT_EQ(kDataSize, encoded_body_length);
-
-  ASSERT_EQ(ResourceMsg_RequestComplete::ID, messages[2]->type());
-  ResourceMsg_RequestComplete::Param completion_params;
-  ResourceMsg_RequestComplete::Read(messages[2].get(), &completion_params);
-  ResourceRequestCompletionStatus completion_status =
-      std::get<1>(completion_params);
-
-  EXPECT_EQ(TotalReceivedBytes(kDataSize),
-            completion_status.encoded_data_length);
-  EXPECT_EQ(kDataSize, completion_status.encoded_body_length);
+  EXPECT_EQ(8, encoded_body_length);
 }
 
 TEST_F(AsyncResourceHandlerTest, TwoChunksLengths) {
   // Larger than kMaxAllocationSize.
-  constexpr auto kDataSize = 64 * 1024;
-  StartRequestAndWaitWithResponseDataSize(kDataSize);
+  StartRequestAndWaitWithResponseDataSize(64*1024);
   const auto& messages = filter_->messages();
   ASSERT_EQ(5u, messages.size());
   ASSERT_EQ(ResourceMsg_DataReceived::ID, messages[2]->type());
   ResourceMsg_DataReceived::Param params;
   ResourceMsg_DataReceived::Read(messages[2].get(), &params);
 
   int encoded_data_length = std::get<3>(params);
   EXPECT_EQ(32768, encoded_data_length);
   int encoded_body_length = std::get<4>(params);
   EXPECT_EQ(32768, encoded_body_length);
 
   ASSERT_EQ(ResourceMsg_DataReceived::ID, messages[3]->type());
   ResourceMsg_DataReceived::Read(messages[3].get(), &params);
 
   encoded_data_length = std::get<3>(params);
   EXPECT_EQ(32768, encoded_data_length);
   encoded_body_length = std::get<4>(params);
   EXPECT_EQ(32768, encoded_body_length);
-
-  ASSERT_EQ(ResourceMsg_RequestComplete::ID, messages[4]->type());
-  ResourceMsg_RequestComplete::Param completion_params;
-  ResourceMsg_RequestComplete::Read(messages[4].get(), &completion_params);
-  ResourceRequestCompletionStatus completion_status =
-      std::get<1>(completion_params);
-  EXPECT_EQ(TotalReceivedBytes(kDataSize),
-            completion_status.encoded_data_length);
-  EXPECT_EQ(kDataSize, completion_status.encoded_body_length);
 }
 
 }  // namespace
 
 }  // namespace content