Make FileSystemOperation::Write take closure-friendly parameters

webkit/browser/fileapi/syncable/syncable_file_system_operation.cc

 // Copyright 2013 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.
 
 #include "webkit/browser/fileapi/syncable/syncable_file_system_operation.h"
 
 #include "base/logging.h"
+#include "net/url_request/url_request_context.h"

[kinuko, 2013/06/12 14:25:08]

This one needs to be "net/url_request/url_request.h", to be fixed in the next
patch

 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/local_file_system_operation.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
 #include "webkit/browser/fileapi/syncable/syncable_file_operation_runner.h"
 #include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/common/blob/shareable_file_reference.h"
 
@@ skipping 188 matching lines @@
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       AsWeakPtr(),
       base::Bind(&FileSystemOperation::Remove,
                  NewOperation()->AsWeakPtr(),
                  url, recursive,
                  base::Bind(&self::DidFinish, AsWeakPtr()))));
   operation_runner_->PostOperationTask(task.Pass());
 }
 
 void SyncableFileSystemOperation::Write(
-    const net::URLRequestContext* url_request_context,
     const FileSystemURL& url,
-    const GURL& blob_url,
-    int64 offset,
+    scoped_ptr<fileapi::FileWriterDelegate> writer_delegate,
+    scoped_ptr<net::URLRequest> blob_request,
     const WriteCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (!operation_runner_.get()) {
     callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND, 0, true);
     return;
   }
   DCHECK(operation_runner_.get());
   target_paths_.push_back(url);
   completion_callback_ = base::Bind(&WriteCallbackAdapter, callback);
   scoped_ptr<SyncableFileOperationRunner::Task> task(new QueueableTask(
       AsWeakPtr(),
-      NewOperation()->GetWriteClosure(
-          url_request_context, url, blob_url, offset,
-          base::Bind(&self::DidWrite, AsWeakPtr(), callback))));
+      base::Bind(&FileSystemOperation::Write,
+                 NewOperation()->AsWeakPtr(),
+                 url,
+                 base::Passed(&writer_delegate),
+                 base::Passed(&blob_request),
+                 base::Bind(&self::DidWrite, AsWeakPtr(), callback))));
   operation_runner_->PostOperationTask(task.Pass());
 }
 
 void SyncableFileSystemOperation::Truncate(
     const FileSystemURL& url, int64 length,
     const StatusCallback& callback) {
   DCHECK(CalledOnValidThread());
   if (!operation_runner_.get()) {
     callback.Run(base::PLATFORM_FILE_ERROR_NOT_FOUND);
     return;
@@ skipping 111 matching lines @@
     operation_runner_->OnOperationCompleted(target_paths_);
   callback.Run(result, bytes, complete);
 }
 
 void SyncableFileSystemOperation::OnCancelled() {
   DCHECK(!completion_callback_.is_null());
   completion_callback_.Run(base::PLATFORM_FILE_ERROR_ABORT);
 }
 
 }  // namespace sync_file_system