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..41be2f3f9839070f0007d1d90cfece45965d98da 100644 |
--- a/content/common/resource_dispatcher_unittest.cc |
+++ b/content/common/resource_dispatcher_unittest.cc |
@@ -56,9 +56,11 @@ 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, |
pfeldman
2011/04/01 08:48:06
nit: one parameter per line.
vsevik
2011/04/01 09:50:59
Done.
|
+ int length_received) { |
EXPECT_FALSE(complete_); |
- data_.append(data, len); |
+ data_.append(data, data_length); |
+ length_received_ += length_received; |
} |
virtual void OnCompletedRequest(const net::URLRequestStatus& status, |
@@ -68,16 +70,20 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer { |
complete_ = true; |
} |
+ bool complete() const { |
pfeldman
2011/04/01 08:48:06
define in the header.
vsevik
2011/04/01 09:50:59
It's a unit test without a header.
|
+ return complete_; |
+ } |
const std::string& data() const { |
return data_; |
} |
- bool complete() const { |
- return complete_; |
+ int lengthReceived() const { |
pfeldman
2011/04/01 08:48:06
either GetLengthReceived or length_received define
vsevik
2011/04/01 09:50:59
Renamed to length_received
|
+ return length_received_; |
} |
private: |
bool complete_; |
std::string data_; |
+ int length_received_; |
}; |
@@ -123,7 +129,8 @@ 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()); |
@@ -242,7 +249,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 +279,8 @@ 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, |
pfeldman
2011/04/01 08:48:06
ditto, ditto, ditto...
vsevik
2011/04/01 09:50:59
Done.
|
+ int length_received) { |
EXPECT_EQ(defer_loading_, false); |
set_defer_loading(false); |
} |