drive/syncFS: Switch to ID based download URL.

chrome/browser/drive/gdata_wapi_service.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/drive/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 using google_apis::AddResourceToDirectoryRequest;
 using google_apis::AppList;
 using google_apis::AuthorizeAppCallback;
 using google_apis::AuthorizeAppRequest;
 using google_apis::AuthService;
 using google_apis::CancelCallback;
 using google_apis::CopyHostedDocumentRequest;
 using google_apis::CreateDirectoryRequest;
 using google_apis::DeleteResourceRequest;
 using google_apis::DownloadActionCallback;
-using google_apis::DownloadFileRequestBase;
+using google_apis::DownloadFileRequest;
 using google_apis::EntryActionCallback;
 using google_apis::GDataErrorCode;
 using google_apis::GDATA_PARSE_ERROR;
 using google_apis::GetAboutResourceCallback;
 using google_apis::GetAccountMetadataRequest;
 using google_apis::GetAppListCallback;
 using google_apis::GetContentCallback;
 using google_apis::GetResourceEntryCallback;
 using google_apis::GetResourceEntryRequest;
 using google_apis::GetResourceListCallback;
@@ skipping 279 matching lines @@
 
   return sender_->StartRequestWithRetry(
       new GetAccountMetadataRequest(sender_.get(),
                                     url_generator_,
                                     base::Bind(&ParseAppListAndRun, callback),
                                     true));  // Include installed apps.
 }
 
 CancelCallback GDataWapiService::DownloadFile(
     const base::FilePath& local_cache_path,
-    const GURL& download_url,
+    const std::string& resource_id,
     const DownloadActionCallback& download_action_callback,
     const GetContentCallback& get_content_callback,
     const ProgressCallback& progress_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!download_action_callback.is_null());
   // get_content_callback and progress_callback may be null.
 
-  // TODO(kinaba): crbug.com/254025: use resource_id based download request.
   return sender_->StartRequestWithRetry(
-      new DownloadFileRequestBase(sender_.get(),
-                                  download_action_callback,
-                                  get_content_callback,
-                                  progress_callback,
-                                  download_url,
-                                  local_cache_path));
+      new DownloadFileRequest(sender_.get(),
+                              url_generator_,
+                              download_action_callback,
+                              get_content_callback,
+                              progress_callback,
+                              resource_id,
+                              local_cache_path));
 }
 
 CancelCallback GDataWapiService::DeleteResource(
     const std::string& resource_id,
     const std::string& etag,
     const EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   return sender_->StartRequestWithRetry(
@@ skipping 235 matching lines @@
   if (CanSendRequest()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToSendRequests());
   } else if (!HasRefreshToken()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnRefreshTokenInvalid());
   }
 }
 
 }  // namespace drive