Dispatch encoded_data_length separately in content/child

chrome/renderer/extensions/extension_localization_peer_unittest.cc

 // Copyright 2013 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 "chrome/renderer/extensions/extension_localization_peer.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
@@ skipping 54 matching lines @@
 
   MOCK_METHOD2(OnUploadProgress, void(uint64_t position, uint64_t size));
   MOCK_METHOD2(OnReceivedRedirect,
                bool(const net::RedirectInfo& redirect_info,
                     const content::ResourceResponseInfo& info));
   MOCK_METHOD1(OnReceivedResponse,
                void(const content::ResourceResponseInfo& info));
   MOCK_METHOD2(OnDownloadedData, void(int len, int encoded_data_length));
   void OnReceivedData(
       std::unique_ptr<RequestPeer::ReceivedData> data) override {
-    OnReceivedDataInternal(data->payload(), data->length(),
-                           data->encoded_data_length());
+    OnReceivedDataInternal(data->payload(), data->length());
   }
-  MOCK_METHOD3(OnReceivedDataInternal,
-               void(const char* data,
-                    int data_length,
-                    int encoded_data_length));
+  MOCK_METHOD2(OnReceivedDataInternal, void(const char* data, int data_length));
+  MOCK_METHOD1(OnTransferSizeUpdated, void(int transfer_size_diff));
   MOCK_METHOD6(OnCompletedRequest,
                void(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));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockRequestPeer);
@@ skipping 40 matching lines @@
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
   EXPECT_TRUE(NULL != filter_peer_.get());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnReceivedData) {
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
   EXPECT_TRUE(GetData().empty());
 
   const std::string data_chunk("12345");
   filter_peer_->OnReceivedData(base::MakeUnique<content::FixedReceivedData>(
-      data_chunk.data(), data_chunk.length(), -1));
+      data_chunk.data(), data_chunk.length()));
 
   EXPECT_EQ(data_chunk, GetData());
 
   filter_peer_->OnReceivedData(base::MakeUnique<content::FixedReceivedData>(
-      data_chunk.data(), data_chunk.length(), -1));
+      data_chunk.data(), data_chunk.length()));
   EXPECT_EQ(data_chunk + data_chunk, GetData());
 }
 
 MATCHER_P(IsURLRequestEqual, status, "") { return arg.status() == status; }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_,
               OnCompletedRequest(net::ERR_ABORTED, false, false,
                                  base::TimeTicks(), -1, 0));
 
   filter_peer_->OnCompletedRequest(net::ERR_FAILED, false, false,
                                    base::TimeTicks(), -1, 0);
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
 
-  EXPECT_CALL(*original_peer_, OnReceivedDataInternal(_, _, _)).Times(0);
+  EXPECT_CALL(*original_peer_, OnReceivedDataInternal(_, _)).Times(0);
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,
                                                   base::TimeTicks(), -1, 0));
 
   filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,
                                    0);
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
 
   SetData("some text");
 
   EXPECT_CALL(*sender_, Send(_));
 
   std::string data = GetData();
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_)).Times(1);
   EXPECT_CALL(*original_peer_,
-              OnReceivedDataInternal(StrEq(data.c_str()), data.length(), -1))
+              OnReceivedDataInternal(StrEq(data.c_str()), data.length()))
       .Times(1);
   EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,
                                                   base::TimeTicks(), -1, -1))
       .Times(1);
 
   filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,
                                    -1);
 
   // Test if Send gets called again (it shouldn't be) when first call returned
   // an empty dictionary.
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_)).Times(1);
   EXPECT_CALL(*original_peer_,
-              OnReceivedDataInternal(StrEq(data.c_str()), data.length(), -1))
+              OnReceivedDataInternal(StrEq(data.c_str()), data.length()))
       .Times(1);
   EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,
                                                   base::TimeTicks(), -1, -1))
       .Times(1);
   SetData("some text");
   filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,
                                    -1);
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_2));
 
   extensions::L10nMessagesMap messages;
   messages.insert(std::make_pair("text", "new text"));
   extensions::ExtensionToL10nMessagesMap& l10n_messages_map =
       *extensions::GetExtensionToL10nMessagesMap();
   l10n_messages_map["some_id2"] = messages;
 
   SetData("some __MSG_text__");
 
   // We already have messages in memory, Send will be skipped.
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   // __MSG_text__ gets replaced with "new text".
   std::string data("some new text");
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_,
-              OnReceivedDataInternal(StrEq(data.c_str()), data.length(), -1));
+              OnReceivedDataInternal(StrEq(data.c_str()), data.length()));
 
   EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,
                                                   base::TimeTicks(), -1, -1));
 
   filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,
                                    -1);
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
   SetUpExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_3));
 
   extensions::L10nMessagesMap messages;
   messages.insert(std::make_pair("text", "new text"));
   extensions::ExtensionToL10nMessagesMap& l10n_messages_map =
       *extensions::GetExtensionToL10nMessagesMap();
   l10n_messages_map["some_id3"] = messages;
 
   std::string message("some __MSG_missing_message__");
   SetData(message);
 
   // We already have messages in memory, Send will be skipped.
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   // __MSG_missing_message__ is missing, so message stays the same.
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
-  EXPECT_CALL(*original_peer_, OnReceivedDataInternal(StrEq(message.c_str()),
-                                                      message.length(), -1));
+  EXPECT_CALL(*original_peer_,
+              OnReceivedDataInternal(StrEq(message.c_str()), message.length()));
 
   EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,
                                                   base::TimeTicks(), -1, 0));
 
   filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,
                                    0);
 }