drive: Add DownloadOperation::EnsureFileDownloadedByResourceId

chrome/browser/chromeos/drive/file_system/operations.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/operations.h"
 
 #include "base/callback.h"
 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
@@ skipping 138 matching lines @@
                            const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!last_access_time.is_null());
   DCHECK(!last_modified_time.is_null());
   DCHECK(!callback.is_null());
 
   touch_operation_->TouchFile(
       file_path, last_access_time, last_modified_time, callback);
 }
 
-void Operations::EnsureFileDownloaded(
+void Operations::EnsureFileDownloadedByResourceId(
+    const std::string& resource_id,
+    const ClientContext& context,
+    const GetFileContentInitializedCallback& initialized_callback,
+    const google_apis::GetContentCallback& get_content_callback,
+    const GetFileCallback& completion_callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!completion_callback.is_null());
+
+  download_operation_->EnsureFileDownloadedByResourceId(
+      resource_id, context, initialized_callback, get_content_callback,
+      completion_callback);
+}
+
+void Operations::EnsureFileDownloadedByPath(
     const base::FilePath& file_path,
     const ClientContext& context,
     const GetFileContentInitializedCallback& initialized_callback,
     const google_apis::GetContentCallback& get_content_callback,
     const GetFileCallback& completion_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!completion_callback.is_null());
 
-  download_operation_->EnsureFileDownloaded(
+  download_operation_->EnsureFileDownloadedByPath(
       file_path, context, initialized_callback, get_content_callback,
       completion_callback);
 }
 
 void Operations::UpdateFileByResourceId(
     const std::string& resource_id,
     const ClientContext& context,
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   update_operation_->UpdateFileByResourceId(resource_id, context, callback);
 }
 
 void Operations::Search(const std::string& search_query,
                         const GURL& next_feed,
                         const SearchOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   search_operation_->Search(search_query, next_feed, callback);
 }
 
 }  // namespace file_system
 }  // namespace drive