Dispatch encoded_data_length separately in content/child

chrome/renderer/extensions/extension_localization_peer_unittest.cc

Index: chrome/renderer/extensions/extension_localization_peer_unittest.cc
diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
index d7f59b5f05acc49ed451689aad5816ef477567ee..94a9b5647347a8043d01b899aa2f29783695ce17 100644
--- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
@@ -72,13 +72,10 @@ class MockRequestPeer : public content::RequestPeer {
   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,
@@ -139,12 +136,12 @@ TEST_F(ExtensionLocalizationPeerTest, OnReceivedData) {
 
   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());
 }
 
@@ -165,7 +162,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {
 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(_));
@@ -186,7 +183,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
   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))
@@ -200,7 +197,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
   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))
@@ -228,7 +225,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
   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));
@@ -254,8 +251,8 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
 
   // __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));