Outsource FileSystemOperationContext from LocalFileSystemOperation

webkit/fileapi/local_file_system_operation.h

Index: webkit/fileapi/local_file_system_operation.h
diff --git a/webkit/fileapi/local_file_system_operation.h b/webkit/fileapi/local_file_system_operation.h
index 94376d4302e9cf982fa9b1cb9ac9d1d3e48a4085..273caaaba233d0fffc77f5176f6b3ce9920b4549 100644
--- a/webkit/fileapi/local_file_system_operation.h
+++ b/webkit/fileapi/local_file_system_operation.h
@@ -130,14 +130,12 @@ class FILEAPI_EXPORT LocalFileSystemOperation
   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
@@ -240,7 +238,7 @@ class FILEAPI_EXPORT LocalFileSystemOperation
   // 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.