Enabled actual transfer size in chromium

content/common/resource_dispatcher_unittest.cc

Index: content/common/resource_dispatcher_unittest.cc
diff --git a/content/common/resource_dispatcher_unittest.cc b/content/common/resource_dispatcher_unittest.cc
index c92ab5ee25c9c2b64d479bee79082ed3023ce9f9..4505ea9c400eb9d9102b057f1e73974c8a39c69b 100644
--- a/content/common/resource_dispatcher_unittest.cc
+++ b/content/common/resource_dispatcher_unittest.cc
@@ -56,9 +56,12 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
   virtual void OnDownloadedData(int len) {
   }
 
-  virtual void OnReceivedData(const char* data, int len) {
+  virtual void OnReceivedData(const char* data,
+                              int data_length,
+                              int length_received) {
     EXPECT_FALSE(complete_);
-    data_.append(data, len);
+    data_.append(data, data_length);
+    length_received_ += length_received;

[darin (slow to review), 2011/04/05 19:02:18]

here length_received_ means the accumulation of chunk sizes, but length_received
means the size of an individual chunk.  using the same term for two different
things is way confusing!

[vsevik, 2011/04/07 16:32:49]

Renamed to raw_data_length/total_raw_data_length.

   }
 
   virtual void OnCompletedRequest(const net::URLRequestStatus& status,
@@ -68,16 +71,20 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
     complete_ = true;
   }
 
+  bool complete() const {
+    return complete_;
+  }
   const std::string& data() const {
     return data_;
   }
-  bool complete() const {
-    return complete_;
+  int length_received() const {

[darin (slow to review), 2011/04/05 19:02:18]

maybe using the prefix "total_" could help here?
total_raw_bytes_received is more clear.

[vsevik, 2011/04/07 16:32:49]

Renamed to raw_data_length/total_raw_data_length.

+    return length_received_;
   }
 
  private:
   bool complete_;
   std::string data_;
+  int length_received_;
 };
 
 
@@ -123,7 +130,11 @@ class ResourceDispatcherTest : public testing::Test,
       EXPECT_TRUE(shared_mem.GiveToProcess(
           base::Process::Current().handle(), &dup_handle));
       dispatcher_->OnReceivedData(
-          message_queue_[0], request_id, dup_handle, test_page_contents_len);
+          message_queue_[0],
+          request_id,
+          dup_handle,
+          test_page_contents_len,
+          test_page_contents_len);
 
       message_queue_.erase(message_queue_.begin());
 
@@ -183,6 +194,7 @@ TEST_F(ResourceDispatcherTest, RoundTrip) {
   // and dispatched, uncomment this.
   //EXPECT_TRUE(callback.complete());
   //EXPECT_STREQ(test_page_contents, callback.data().c_str());
+  //EXPECT_EQ(test_page_contents_len, callback.length_received());
 
   delete bridge;
 }
@@ -242,7 +254,7 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
                                               &duplicated_handle));
 
     response_message =
-        new ResourceMsg_DataReceived(0, 0, duplicated_handle, 100);
+        new ResourceMsg_DataReceived(0, 0, duplicated_handle, 100, 100);
 
     dispatcher_->OnMessageReceived(*response_message);
 
@@ -272,7 +284,9 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
   virtual void OnDownloadedData(int len) {
   }
 
-  virtual void OnReceivedData(const char* data, int len) {
+  virtual void OnReceivedData(const char* data,
+                              int data_length,
+                              int length_received) {
     EXPECT_EQ(defer_loading_, false);
     set_defer_loading(false);
   }