Make FileSystemOperation NOT self-destruct

webkit/browser/fileapi/syncable/syncable_file_system_operation.h

Index: webkit/browser/fileapi/syncable/syncable_file_system_operation.h
diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_operation.h b/webkit/browser/fileapi/syncable/syncable_file_system_operation.h
index f8083479687f02ee3024609ad4ee75f386d35287..90b68b2d088fc6e3cc99b2135680a72452e05ff6 100644
--- a/webkit/browser/fileapi/syncable/syncable_file_system_operation.h
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_operation.h
@@ -28,6 +28,7 @@ class SyncableFileOperationRunner;
 // A wrapper class of LocalFileSystemOperation for syncable file system.
 class WEBKIT_STORAGE_EXPORT SyncableFileSystemOperation
     : public fileapi::LocalFileSystemOperation,
+      public base::SupportsWeakPtr<SyncableFileSystemOperation>,
       public base::NonThreadSafe {
  public:
   virtual ~SyncableFileSystemOperation();
@@ -81,6 +82,8 @@ class WEBKIT_STORAGE_EXPORT SyncableFileSystemOperation
                                  const fileapi::FileSystemURL& dest_url,
                                  const StatusCallback& callback) OVERRIDE;
 
+  using base::SupportsWeakPtr<SyncableFileSystemOperation>::AsWeakPtr;
+
  private:
   typedef SyncableFileSystemOperation self;
   class QueueableTask;
@@ -101,13 +104,11 @@ class WEBKIT_STORAGE_EXPORT SyncableFileSystemOperation
                 bool complete);
 
   void OnCancelled();
-  void AbortOperation(const StatusCallback& callback,
-                      base::PlatformFileError error);
 
   const fileapi::FileSystemURL url_;
 
   base::WeakPtr<SyncableFileOperationRunner> operation_runner_;
-  fileapi::LocalFileSystemOperation* inflight_operation_;
+  scoped_ptr<fileapi::LocalFileSystemOperation> inflight_operation_;
   std::vector<fileapi::FileSystemURL> target_paths_;
 
   StatusCallback completion_callback_;