net: Stop using base::WorkerPool from UploadFileElementReader

webkit/glue/resource_request_body.cc

Index: webkit/glue/resource_request_body.cc
diff --git a/webkit/glue/resource_request_body.cc b/webkit/glue/resource_request_body.cc
index b75666f55afe045e2249124ef1e752dd4730dc1e..b5b47137bcd09804db48602203f1d8f267fa00d9 100644
--- a/webkit/glue/resource_request_body.cc
+++ b/webkit/glue/resource_request_body.cc
@@ -9,6 +9,8 @@
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
 #include "webkit/blob/blob_storage_controller.h"
+#include "webkit/fileapi/file_system_context.h"
+#include "webkit/fileapi/file_system_task_runners.h"
 
 using webkit_blob::BlobData;
 using webkit_blob::BlobStorageController;
@@ -41,8 +43,10 @@ class BytesElementReader : public net::UploadBytesElementReader {
 class FileElementReader : public net::UploadFileElementReader {
  public:
   FileElementReader(ResourceRequestBody* resource_request_body,
+                    base::TaskRunner* task_runner,
                     const ResourceRequestBody::Element& element)
-      : net::UploadFileElementReader(element.path(),
+      : net::UploadFileElementReader(task_runner,
+                                     element.path(),
                                      element.offset(),
                                      element.length(),
                                      element.expected_modification_time()),
@@ -93,7 +97,8 @@ void ResourceRequestBody::AppendFileSystemFileRange(
 
 net::UploadDataStream*
 ResourceRequestBody::ResolveElementsAndCreateUploadDataStream(
-    BlobStorageController* blob_controller) {
+    BlobStorageController* blob_controller,
+    fileapi::FileSystemContext* file_system_context) {
   // Resolve all blob elements.
   std::vector<const Element*> resolved_elements;
   for (size_t i = 0; i < elements_.size(); ++i) {
@@ -114,7 +119,10 @@ ResourceRequestBody::ResolveElementsAndCreateUploadDataStream(
         element_readers.push_back(new BytesElementReader(this, element));
         break;
       case Element::TYPE_FILE:
-        element_readers.push_back(new FileElementReader(this, element));
+        element_readers.push_back(new FileElementReader(
+            this,
+            file_system_context->task_runners()->file_task_runner(),

[kinuko, 2013/01/07 08:16:22]

While I can see why you wanted to pass file_system_context to this method for
future use it feels a bit weird to me using the FileSystemContext's task runner
for TYPE_FILE here (as it's not necessarily for fileapi files).  At least in
this patch shouldn't we simply pass in a task runner?

[hashimoto, 2013/01/07 09:12:33]

Done.

When we support Filesystem files, are we going to replace the TaskRunner with
FileSystemContext, or pass both TaskRunner and FileSystemContext?

[kinuko, 2013/01/08 03:32:48]

To me passing both sounds more reasonable, though it's a bit unfortunate.

+            element));
         break;
       case Element::TYPE_FILE_FILESYSTEM:
         // TODO(kinuko): Resolve FileSystemURL before creating UploadData.