Outsource FileSystemOperationContext from LocalFileSystemOperation

webkit/fileapi/local_file_system_operation.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 WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_
 #define WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 112 matching lines @@
   friend class SandboxMountPointProvider;
   friend class TestMountPointProvider;
   friend class chromeos::CrosMountPointProvider;
 
   friend class FileSystemOperationTest;
   friend class FileSystemOperationWriteTest;
   friend class FileWriterDelegateTest;
   friend class FileSystemQuotaTest;
   friend class LocalFileSystemTestOriginHelper;
 
-  explicit LocalFileSystemOperation(FileSystemContext* file_system_context);
+  LocalFileSystemOperation(
+      FileSystemContext* file_system_context,
+      scoped_ptr<FileSystemOperationContext> operation_context);
 
   FileSystemContext* file_system_context() const {
-    return operation_context_.file_system_context();
-  }
-
-  FileSystemOperationContext* file_system_operation_context() {
-    return &operation_context_;
+    return operation_context_->file_system_context();
   }
 
   // The unit tests that need to specify and control the lifetime of the
   // file_util on their own should call this before performing the actual
   // operation. If it is given it will not be overwritten by the class.
   void set_override_file_util(FileSystemFileUtil* file_util) {
     src_util_ = file_util;
     dest_util_ = file_util;
   }
 
@@ skipping 82 matching lines @@
   // Checks the validity of a given |url| and populates |file_util| for |mode|.
   base::PlatformFileError SetUp(
       const FileSystemURL& url,
       FileSystemFileUtil** file_util,
       SetUpMode mode);
 
   // Used only for internal assertions.
   // Returns false if there's another inflight pending operation.
   bool SetPendingOperationType(OperationType type);
 
-  FileSystemOperationContext operation_context_;
+  scoped_ptr<FileSystemOperationContext> operation_context_;
   FileSystemFileUtil* src_util_;  // Not owned.
   FileSystemFileUtil* dest_util_;  // Not owned.
 
   // This is set before any write operations.  The destructor of
   // ScopedQuotaNotifier sends notification to the QuotaManager
   // to tell the update is done; so that we can make sure notify
   // the manager after any write operations are done.
   scoped_ptr<ScopedQuotaNotifier> scoped_quota_notifier_;
 
   // These are all used only by Write().
@@ skipping 20 matching lines @@
   // LocalFileSystemOperation instance is usually deleted upon completion but
   // could be deleted while it has inflight callbacks when Cancel is called.
   base::WeakPtrFactory<LocalFileSystemOperation> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileSystemOperation);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_