drive: Return cancel closure from FileSystem::GetFileContent

chrome/browser/chromeos/drive/fake_file_system_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 "chrome/browser/chromeos/drive/fake_file_system.h"
 
 #include "base/file_util.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/drive/fake_drive_service.h"
@@ skipping 20 matching lines @@
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<FakeDriveService> fake_drive_service_;
   scoped_ptr<FakeFileSystem> fake_file_system_;
 };
 
 TEST_F(FakeFileSystemTest, GetFileContent) {
   FileError initialize_error = FILE_ERROR_FAILED;
   scoped_ptr<ResourceEntry> entry;
   base::FilePath cache_file_path;
-  base::Closure cancel_download;
   google_apis::test_util::TestGetContentCallback get_content_callback;
   FileError completion_error = FILE_ERROR_FAILED;
 
   const base::FilePath kDriveFile =
       util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
 
   // For the first time, the file should be downloaded from the service.
-  fake_file_system_->GetFileContent(
+  base::Closure cancel_download = fake_file_system_->GetFileContent(
       kDriveFile,
       google_apis::test_util::CreateCopyResultCallback(
-          &initialize_error, &entry, &cache_file_path, &cancel_download),
+          &initialize_error, &cache_file_path, &entry),
       get_content_callback.callback(),
       google_apis::test_util::CreateCopyResultCallback(&completion_error));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(FILE_ERROR_OK, initialize_error);
   EXPECT_TRUE(entry);
 
   // No cache file is available yet.
   EXPECT_TRUE(cache_file_path.empty());
 
   // The download should be happened so the |get_content_callback|
   // should have the actual data.
   std::string content = get_content_callback.GetConcatenatedData();
   EXPECT_EQ(26U, content.size());
   EXPECT_EQ(FILE_ERROR_OK, completion_error);
 
   initialize_error = FILE_ERROR_FAILED;
   entry.reset();
   get_content_callback.mutable_data()->clear();
   completion_error = FILE_ERROR_FAILED;
 
   // For the second time, the cache file should be found.
-  fake_file_system_->GetFileContent(
+  cancel_download = fake_file_system_->GetFileContent(
       kDriveFile,
       google_apis::test_util::CreateCopyResultCallback(
-          &initialize_error, &entry, &cache_file_path, &cancel_download),
+          &initialize_error, &cache_file_path, &entry),
       get_content_callback.callback(),
       google_apis::test_util::CreateCopyResultCallback(&completion_error));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(FILE_ERROR_OK, initialize_error);
   EXPECT_TRUE(entry);
 
   // Cache file should be available.
   ASSERT_FALSE(cache_file_path.empty());
 
   // There should be a cache file so no data should be downloaded.
   EXPECT_TRUE(get_content_callback.data().empty());
   EXPECT_EQ(FILE_ERROR_OK, completion_error);
 
   // Make sure the cached file's content.
   std::string cache_file_content;
   ASSERT_TRUE(
       base::ReadFileToString(cache_file_path, &cache_file_content));
   EXPECT_EQ(content, cache_file_content);
 }
 
 TEST_F(FakeFileSystemTest, GetFileContent_Directory) {
   FileError initialize_error = FILE_ERROR_FAILED;
   scoped_ptr<ResourceEntry> entry;
   base::FilePath cache_file_path;
   google_apis::test_util::TestGetContentCallback get_content_callback;
   FileError completion_error = FILE_ERROR_FAILED;
-  base::Closure cancel_download;
-
-  fake_file_system_->GetFileContent(
+  base::Closure cancel_download = fake_file_system_->GetFileContent(
       util::GetDriveMyDriveRootPath(),
       google_apis::test_util::CreateCopyResultCallback(
-          &initialize_error, &entry, &cache_file_path, &cancel_download),
+          &initialize_error, &cache_file_path, &entry),
       get_content_callback.callback(),
       google_apis::test_util::CreateCopyResultCallback(&completion_error));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(FILE_ERROR_NOT_A_FILE, completion_error);
 }
 
 TEST_F(FakeFileSystemTest, GetResourceEntry) {
   FileError error = FILE_ERROR_FAILED;
   scoped_ptr<ResourceEntry> entry;
@@ skipping 30 matching lines @@
       util::GetDriveMyDriveRootPath().AppendASCII("Invalid File Name"),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(FILE_ERROR_NOT_FOUND, error);
   ASSERT_FALSE(entry);
 }
 
 }  // namespace test_util
 }  // namespace drive