drive: Return cancel closure from FileSystem::GetFileContent

chrome/browser/chromeos/drive/fake_file_system.cc

 // Copyright (c) 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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 109 matching lines @@
 void FakeFileSystem::GetFile(const base::FilePath& file_path,
                              const GetFileCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void FakeFileSystem::GetFileForSaving(const base::FilePath& file_path,
                                       const GetFileCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
-void FakeFileSystem::GetFileContent(
+base::Closure FakeFileSystem::GetFileContent(
     const base::FilePath& file_path,
     const GetFileContentInitializedCallback& initialized_callback,
     const google_apis::GetContentCallback& get_content_callback,
     const FileOperationCallback& completion_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetResourceEntry(
       file_path,
       base::Bind(&FakeFileSystem::GetFileContentAfterGetResourceEntry,
                  weak_ptr_factory_.GetWeakPtr(),
                  initialized_callback, get_content_callback,
                  completion_callback));
+  return base::Bind(&base::DoNothing);
 }
 
 void FakeFileSystem::GetResourceEntry(
     const base::FilePath& file_path,
     const GetResourceEntryCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Now, we only support files under my drive.
   DCHECK(!util::IsUnderDriveMountPoint(file_path));
 
@@ skipping 135 matching lines @@
   std::string parent_resource_id;
   bool converted =
       ConvertToResourceEntry(*gdata_entry, entry.get(), &parent_resource_id);
   DCHECK(converted);
   entry->set_parent_local_id(parent_resource_id);
 
   base::FilePath cache_path =
       cache_dir_.path().AppendASCII(entry->resource_id());
   if (base::PathExists(cache_path)) {
     // Cache file is found.
-    initialized_callback.Run(FILE_ERROR_OK, entry.Pass(), cache_path,
-                             base::Closure());
+    initialized_callback.Run(FILE_ERROR_OK, cache_path, entry.Pass());
     completion_callback.Run(FILE_ERROR_OK);
     return;
   }
 
-  initialized_callback.Run(FILE_ERROR_OK, entry.Pass(), base::FilePath(),
-                           base::Bind(&base::DoNothing));
+  initialized_callback.Run(FILE_ERROR_OK, base::FilePath(), entry.Pass());
   drive_service_->DownloadFile(
       cache_path,
       gdata_entry->resource_id(),
       base::Bind(&FakeFileSystem::GetFileContentAfterDownloadFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  completion_callback),
       get_content_callback,
       google_apis::ProgressCallback());
 }
 
@@ skipping 75 matching lines @@
       callback.Run(FILE_ERROR_OK, entry.Pass());
       return;
     }
   }
 
   callback.Run(FILE_ERROR_NOT_FOUND, scoped_ptr<ResourceEntry>());
 }
 
 }  // namespace test_util
 }  // namespace drive