net: Stop using base::WorkerPool from UploadFileElementReader

net/base/upload_file_element_reader.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_BASE_UPLOAD_FILE_ELEMENT_READER_H_
 #define NET_BASE_UPLOAD_FILE_ELEMENT_READER_H_
 
 #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;
 
 // An UploadElementReader implementation for file.
 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);
   virtual ~UploadFileElementReader();
 
   const FilePath& path() const { return path_; }
   uint64 range_offset() const { return range_offset_; }
   uint64 range_length() const { return range_length_; }
   const base::Time& expected_modification_time() const {
     return expected_modification_time_;
@@ skipping 31 matching lines @@
                        const CompletionCallback& callback,
                        int result);
 
   // Sets an value to override the result for GetContentLength().
   // Used for tests.
   struct NET_EXPORT_PRIVATE ScopedOverridingContentLengthForTests {
     ScopedOverridingContentLengthForTests(uint64 value);
     ~ScopedOverridingContentLengthForTests();
   };
 
+  scoped_refptr<base::TaskRunner> task_runner_;
   const FilePath path_;
   const uint64 range_offset_;
   const uint64 range_length_;
   const base::Time expected_modification_time_;
   ScopedFileStreamPtr file_stream_;
   uint64 content_length_;
   uint64 bytes_remaining_;
   base::WeakPtrFactory<UploadFileElementReader> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UploadFileElementReader);
@@ skipping 26 matching lines @@
   scoped_ptr<FileStream> file_stream_;
   uint64 content_length_;
   uint64 bytes_remaining_;
 
   DISALLOW_COPY_AND_ASSIGN(UploadFileElementReaderSync);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_UPLOAD_FILE_ELEMENT_READER_H_