Make FileSystemOperation NOT self-destruct

chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.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 <set>
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 173 matching lines @@
     bool /*has_more*/) {
   DCHECK(error_result);
   DCHECK(file_list_result);
   *error_result = error;
   *file_list_result = file_list;
   run_loop->Quit();
 }
 
 base::PlatformFileError ReadDirectoryTestHelper(
     fileapi::AsyncFileUtil* file_util,
-    FileSystemOperationContext* operation_context,
+    scoped_ptr<FileSystemOperationContext> operation_context,
     FileSystemURL url,
     fileapi::AsyncFileUtil::EntryList* file_list) {
   base::RunLoop run_loop;
   base::PlatformFileError result;
   file_util->ReadDirectory(
-      operation_context,
+      operation_context.Pass(),
       url,
       base::Bind(&ReadDirectoryTestCallback, &run_loop, &result, file_list));
   run_loop.Run();
   return result;
 }
 
 }  // namespace
 
 class PicasaFileUtilTest : public testing::Test {
  public:
@@ skipping 189 matching lines @@
   expected_names.push_back("duplicate " + test_date_string + " (1)");
 
   folders.push_back(
       AlbumInfo("duplicate", test_date, "uuid5", base::FilePath()));
   expected_names.push_back("duplicate " + test_date_string + " (2)");
 
   folders.push_back(
       AlbumInfo("unique_name", test_date, "uuid1", base::FilePath()));
   expected_names.push_back("unique_name " + test_date_string);
 
-  FileSystemOperationContext operation_context(file_system_context().get());
+  scoped_ptr<FileSystemOperationContext> operation_context(
+      new FileSystemOperationContext(file_system_context().get()));
 
   scoped_ptr<chrome::MediaPathFilter> media_path_filter(
       new chrome::MediaPathFilter());
 
-  operation_context.SetUserValue(
+  operation_context->SetUserValue(
       chrome::MediaFileSystemMountPointProvider::kMediaPathFilterKey,
       media_path_filter.get());
 
   scoped_ptr<PicasaDataProvider> data_provider(
       new TestPicasaDataProvider(std::vector<AlbumInfo>(), folders));
   TestPicasaFileUtil test_file_util(data_provider.Pass());
 
   fileapi::AsyncFileUtil::EntryList file_list;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            ReadDirectoryTestHelper(&test_file_util, &operation_context,
+            ReadDirectoryTestHelper(&test_file_util, operation_context.Pass(),
                                     CreateURL(kPicasaDirFolders),
                                     &file_list));
 
   ASSERT_EQ(expected_names.size(), file_list.size());
   for (size_t i = 0; i < file_list.size(); ++i) {
     EXPECT_EQ(expected_names[i],
               base::FilePath(file_list[i].name).AsUTF8Unsafe());
     EXPECT_EQ(folders[i].timestamp, file_list[i].last_modified_time);
     EXPECT_TRUE(file_list[i].is_directory);
   }
@@ skipping 70 matching lines @@
         new TestFolder(base::StringPrintf("folder-%05d", i),
                        date,
                        base::StringPrintf("uid%05d", i), i % 5, i % 3));
   }
 
   SetupFolders(&test_folders);
   VerifyFolderDirectoryList(test_folders);
 }
 
 }  // namespace picasa