Outsource FileSystemOperationContext from LocalFileSystemOperation

webkit/fileapi/local_file_system_test_helper.cc

 // 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.
 
 #include "webkit/fileapi/local_file_system_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
@@ skipping 155 matching lines @@
 
 int64
 LocalFileSystemTestOriginHelper::ComputeCurrentDirectoryDatabaseUsage() const {
   return file_util::ComputeDirectorySize(
       GetOriginRootPath().AppendASCII("Paths"));
 }
 
 LocalFileSystemOperation* LocalFileSystemTestOriginHelper::NewOperation() {
   DCHECK(file_system_context_.get());
   DCHECK(file_util_);
+  scoped_ptr<FileSystemOperationContext> operation_context(
+      new FileSystemOperationContext(file_system_context_.get()));
   LocalFileSystemOperation* operation =
-    new LocalFileSystemOperation(file_system_context_.get());
+      new LocalFileSystemOperation(file_system_context_.get(),
+                                   operation_context.Pass());
   operation->set_override_file_util(file_util_);
   return operation;
 }
 
 FileSystemOperationContext*
 LocalFileSystemTestOriginHelper::NewOperationContext() {
   DCHECK(file_system_context_.get());
   FileSystemOperationContext* context =
     new FileSystemOperationContext(file_system_context_.get());
   return context;
 }
 
 }  // namespace fileapi