net: Stop using base::WorkerPool from UploadFileElementReader

net/base/upload_file_element_reader.h

Index: net/base/upload_file_element_reader.h
diff --git a/net/base/upload_file_element_reader.h b/net/base/upload_file_element_reader.h
index f85d45f756af1ea3aa3027898c7b119cdef4c8e5..24ec7cc4ab6660ec9b6adb60e3f277a221007ea3 100644
--- a/net/base/upload_file_element_reader.h
+++ b/net/base/upload_file_element_reader.h
@@ -8,11 +8,16 @@
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "net/base/upload_element_reader.h"
 
+namespace base {
+class TaskRunner;
+}
+
 namespace net {
 
 class FileStream;
@@ -21,15 +26,21 @@ class FileStream;
 class NET_EXPORT UploadFileElementReader : public UploadElementReader {
  public:
   // Deletes FileStream on the worker pool to avoid blocking the IO thread.
-  // This class is used as a template argument of scoped_ptr_malloc.
+  // This class is used as a template argument of scoped_ptr.
   class FileStreamDeleter {
    public:
+    explicit FileStreamDeleter(base::TaskRunner* task_runner);
+    ~FileStreamDeleter();
     void operator() (FileStream* file_stream) const;
+
+   private:
+    scoped_refptr<base::TaskRunner> task_runner_;
   };
 
-  typedef scoped_ptr_malloc<FileStream, FileStreamDeleter> ScopedFileStreamPtr;
+  typedef scoped_ptr<FileStream, FileStreamDeleter> ScopedFileStreamPtr;
 
-  UploadFileElementReader(const FilePath& path,
+  UploadFileElementReader(base::TaskRunner* task_runner,

[mmenke, 2013/01/07 16:42:24]

Think it's worth mentioning that |task_runner| should never be NULL, except in
unit tests.  May even be better to DCHECK that it's not NULL, and just pass in a
junk message loop in the unit tests, actually.

[hashimoto, 2013/01/08 02:27:36]

Stopped allowing NULL task_runner.

+                          const FilePath& path,
                           uint64 range_offset,
                           uint64 range_length,
                           const base::Time& expected_modification_time);
@@ -81,6 +92,7 @@ class NET_EXPORT UploadFileElementReader : public UploadElementReader {
     ~ScopedOverridingContentLengthForTests();
   };
 
+  scoped_refptr<base::TaskRunner> task_runner_;
   const FilePath path_;
   const uint64 range_offset_;
   const uint64 range_length_;