| Index: webkit/glue/resource_request_body_unittest.cc
|
| diff --git a/webkit/glue/resource_request_body_unittest.cc b/webkit/glue/resource_request_body_unittest.cc
|
| index 21342f036b550c8aaa15d271821599dee4bea6a8..636b56d89167e399c4da0a0cb9f896e0c293e57c 100644
|
| --- a/webkit/glue/resource_request_body_unittest.cc
|
| +++ b/webkit/glue/resource_request_body_unittest.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| +#include "base/message_loop_proxy.h"
|
| #include "base/time.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "net/base/upload_bytes_element_reader.h"
|
| @@ -68,7 +69,8 @@ TEST(ResourceRequestBodyTest, CreateUploadDataStreamWithoutBlob) {
|
| request_body->set_identifier(kIdentifier);
|
|
|
| scoped_ptr<net::UploadDataStream> upload(
|
| - request_body->ResolveElementsAndCreateUploadDataStream(NULL));
|
| + request_body->ResolveElementsAndCreateUploadDataStream(
|
| + NULL, base::MessageLoopProxy::current()));
|
|
|
| EXPECT_EQ(kIdentifier, upload->identifier());
|
| ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size());
|
| @@ -139,7 +141,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
|
|
|
| scoped_ptr<net::UploadDataStream> upload(
|
| request_body->ResolveElementsAndCreateUploadDataStream(
|
| - &blob_storage_controller));
|
| + &blob_storage_controller, base::MessageLoopProxy::current()));
|
|
|
| ASSERT_EQ(2U, upload->element_readers().size());
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
|
| @@ -150,7 +152,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
|
| request_body->AppendBlob(blob_url0);
|
|
|
| upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
|
| - &blob_storage_controller));
|
| + &blob_storage_controller, base::MessageLoopProxy::current()));
|
| ASSERT_EQ(0U, upload->element_readers().size());
|
|
|
| // Test having only one blob reference.
|
| @@ -158,7 +160,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
|
| request_body->AppendBlob(blob_url1);
|
|
|
| upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
|
| - &blob_storage_controller));
|
| + &blob_storage_controller, base::MessageLoopProxy::current()));
|
| ASSERT_EQ(2U, upload->element_readers().size());
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
|
| @@ -173,7 +175,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
|
| upload_element2.expected_modification_time());
|
|
|
| upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
|
| - &blob_storage_controller));
|
| + &blob_storage_controller, base::MessageLoopProxy::current()));
|
| ASSERT_EQ(4U, upload->element_readers().size());
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
|
| @@ -190,7 +192,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
|
| request_body->AppendBlob(blob_url1);
|
|
|
| upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
|
| - &blob_storage_controller));
|
| + &blob_storage_controller, base::MessageLoopProxy::current()));
|
| ASSERT_EQ(4U, upload->element_readers().size());
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], upload_element2));
|
| @@ -207,7 +209,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
|
| upload_element2.expected_modification_time());
|
|
|
| upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
|
| - &blob_storage_controller));
|
| + &blob_storage_controller, base::MessageLoopProxy::current()));
|
| ASSERT_EQ(4U, upload->element_readers().size());
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element1));
|
| @@ -226,7 +228,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
|
| upload_element2.expected_modification_time());
|
|
|
| upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
|
| - &blob_storage_controller));
|
| + &blob_storage_controller, base::MessageLoopProxy::current()));
|
| ASSERT_EQ(8U, upload->element_readers().size());
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
|
| EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
|
|
|