net: Stop using base::WorkerPool from UploadFileElementReader

webkit/glue/resource_request_body_unittest.cc

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..ae7c79e4a4c345b5b066c78b3833fab01bddd115 100644
--- a/webkit/glue/resource_request_body_unittest.cc
+++ b/webkit/glue/resource_request_body_unittest.cc
@@ -68,7 +68,7 @@ TEST(ResourceRequestBodyTest, CreateUploadDataStreamWithoutBlob) {
   request_body->set_identifier(kIdentifier);
 
   scoped_ptr<net::UploadDataStream> upload(
-      request_body->ResolveElementsAndCreateUploadDataStream(NULL));
+      request_body->ResolveElementsAndCreateUploadDataStream(NULL, NULL));
 
   EXPECT_EQ(kIdentifier, upload->identifier());
   ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size());
@@ -139,7 +139,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
 
   scoped_ptr<net::UploadDataStream> upload(
       request_body->ResolveElementsAndCreateUploadDataStream(
-          &blob_storage_controller));
+          &blob_storage_controller, NULL));
 
   ASSERT_EQ(2U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
@@ -150,7 +150,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
   request_body->AppendBlob(blob_url0);
 
   upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller));
+      &blob_storage_controller, NULL));
   ASSERT_EQ(0U, upload->element_readers().size());
 
   // Test having only one blob reference.
@@ -158,7 +158,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
   request_body->AppendBlob(blob_url1);
 
   upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller));
+      &blob_storage_controller, NULL));
   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 +173,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.expected_modification_time());
 
   upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller));
+      &blob_storage_controller, NULL));
   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 +190,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
   request_body->AppendBlob(blob_url1);
 
   upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller));
+      &blob_storage_controller, NULL));
   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 +207,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.expected_modification_time());
 
   upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller));
+      &blob_storage_controller, NULL));
   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 +226,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.expected_modification_time());
 
   upload.reset(request_body->ResolveElementsAndCreateUploadDataStream(
-      &blob_storage_controller));
+      &blob_storage_controller, NULL));
   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));