Remove CloseFile from FileSystem.

chrome/browser/chromeos/drive/file_system_unittest.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 "chrome/browser/chromeos/drive/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 723 matching lines @@
   ASSERT_TRUE(LoadFullResourceList());
 
   const base::FilePath kFileInRoot(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   scoped_ptr<ResourceEntry> entry(GetResourceEntryByPathSync(kFileInRoot));
   const std::string& file_resource_id = entry->resource_id();
   const std::string& md5 = entry->file_specific_info().md5();
 
   // Open kFileInRoot ("drive/root/File 1.txt").
   FileError error = FILE_ERROR_FAILED;
   base::FilePath file_path;
+  base::Closure on_close_callback;
   file_system_->OpenFile(
       kFileInRoot,
       OPEN_FILE,
-      google_apis::test_util::CreateCopyResultCallback(&error, &file_path));
+      google_apis::test_util::CreateCopyResultCallback(
+          &error, &file_path, &on_close_callback));
   test_util::RunBlockingPoolTask();
   const base::FilePath opened_file_path = file_path;
 
   // Verify that the file was properly opened.
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // The opened file is downloaded, which means the file is available
   // offline. The directory change should be notified so Files.app can change
   // the offline availability status of the file.
   ASSERT_EQ(1u, mock_directory_observer_->changed_directories().size());
@@ skipping 14 matching lines @@
   base::FilePath cache_file_path;
   EXPECT_EQ(FILE_ERROR_OK,
             cache_->GetFile(file_resource_id, md5, &cache_file_path));
   EXPECT_EQ(cache_file_path, opened_file_path);
 
   // Write a new content.
   const std::string kNewContent = kExpectedContent + kExpectedContent;
   EXPECT_TRUE(google_apis::test_util::WriteStringToFile(cache_file_path,
                                                         kNewContent));
 
   // Close kFileInRoot ("drive/root/File 1.txt").

[hashimoto, 2013/07/23 11:24:58]

nit: How about ASSERT_FALSE(on_close_callback.is_null())?

[hidehiko, 2013/07/23 14:32:24]

Done.

-  file_system_->CloseFile(
-      kFileInRoot,
-      google_apis::test_util::CreateCopyResultCallback(&error));
+  on_close_callback.Run();
   test_util::RunBlockingPoolTask();
 
   // Verify that the file was properly closed.
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Verify that the file was synced as expected.
   google_apis::GDataErrorCode gdata_error = google_apis::GDATA_FILE_ERROR;
   scoped_ptr<google_apis::ResourceEntry> gdata_entry;
   fake_drive_service_->GetResourceEntry(
       file_resource_id,
       google_apis::test_util::CreateCopyResultCallback(
           &gdata_error, &gdata_entry));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(gdata_error, google_apis::HTTP_SUCCESS);
   ASSERT_TRUE(gdata_entry);
   EXPECT_EQ(static_cast<int>(kNewContent.size()), gdata_entry->file_size());
 
   // The modified file is uploaded. The directory change should be notified
   // so Files.app can show new metadata of the modified file.
   ASSERT_EQ(2u, mock_directory_observer_->changed_directories().size());
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("drive/root")),
             mock_directory_observer_->changed_directories()[1]);
-
-  // Try to close the same file twice.
-  file_system_->CloseFile(
-      kFileInRoot,
-      google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
-
-  // It must fail.
-  EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
-  // There should be no new directory change.
-  ASSERT_EQ(2u, mock_directory_observer_->changed_directories().size());
 }
 
 TEST_F(FileSystemTest, MarkCacheFileAsMountedAndUnmounted) {
   ASSERT_TRUE(LoadFullResourceList());
 
   base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   scoped_ptr<ResourceEntry> entry(GetResourceEntryByPathSync(file_in_root));
   ASSERT_TRUE(entry);
 
   // Write to cache.
@@ skipping 21 matching lines @@
       file_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Now able to remove the cache entry.
   EXPECT_EQ(FILE_ERROR_OK, cache_->Remove(entry->resource_id()));
 }
 
 }   // namespace drive