Use new API to download blobs from Google Drive.

google_apis/drive/drive_api_url_generator.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 "google_apis/drive/drive_api_url_generator.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/google_api_keys.h"
@@ skipping 13 matching lines @@
 const char kDriveV2ChildrenUrlFormat[] = "drive/v2/files/%s/children";
 const char kDriveV2ChildrenUrlForRemovalFormat[] =
     "drive/v2/files/%s/children/%s";
 const char kDriveV2FileCopyUrlFormat[] = "drive/v2/files/%s/copy";
 const char kDriveV2FileDeleteUrlFormat[] = "drive/v2/files/%s";
 const char kDriveV2FileTrashUrlFormat[] = "drive/v2/files/%s/trash";
 const char kDriveV2UploadNewFileUrl[] = "upload/drive/v2/files";
 const char kDriveV2UploadExistingFileUrlPrefix[] = "upload/drive/v2/files/";
 const char kDriveV2BatchUploadUrl[] = "upload/drive";
 const char kDriveV2PermissionsUrlFormat[] = "drive/v2/files/%s/permissions";
-const char kDriveV2DownloadUrlFormat[] = "host/%s";
+const char kDriveV2DownloadUrlFormat[] = "drive/v2/files/%s?alt=media";
 const char kDriveV2ThumbnailUrlFormat[] = "d/%s=w%d-h%d";
 const char kDriveV2ThumbnailUrlWithCropFormat[] = "d/%s=w%d-h%d-c";
 
 // apps.delete and file.authorize API is exposed through a special endpoint
 // v2internal that is accessible only by the official API key for Chrome.
 const char kDriveV2InternalAppsUrl[] = "drive/v2internal/apps";
 const char kDriveV2AppsDeleteUrlFormat[] = "drive/v2internal/apps/%s";
 const char kDriveV2FilesAuthorizeUrlFormat[] =
     "drive/v2internal/files/%s/authorize?appId=%s";
 const char kDriveV2InternalFileUrlPrefix[] = "drive/v2internal/files/";
 
 GURL AddResumableUploadParam(const GURL& url) {
   return net::AppendOrReplaceQueryParameter(url, "uploadType", "resumable");
 }
 
 GURL AddMultipartUploadParam(const GURL& url) {
   return net::AppendOrReplaceQueryParameter(url, "uploadType", "multipart");
 }
 
 }  // namespace
 
 DriveApiUrlGenerator::DriveApiUrlGenerator(const GURL& base_url,
-                                           const GURL& base_download_url,
                                            const GURL& base_thumbnail_url)
     : base_url_(base_url),
-      base_download_url_(base_download_url),
       base_thumbnail_url_(base_thumbnail_url) {
   // Do nothing.
 }
 
 DriveApiUrlGenerator::~DriveApiUrlGenerator() {
   // Do nothing.
 }
 
 const char DriveApiUrlGenerator::kBaseUrlForProduction[] =
     "https://www.googleapis.com";
 
-const char DriveApiUrlGenerator::kBaseDownloadUrlForProduction[] =
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
-    "https://www.googledrive.com/p/";
-#else
-    "https://www.googledrive.com";
-#endif
-
 const char DriveApiUrlGenerator::kBaseThumbnailUrlForProduction[] =
     "https://lh3.googleusercontent.com";
 
 GURL DriveApiUrlGenerator::GetAboutGetUrl() const {
   return base_url_.Resolve(kDriveV2AboutUrl);
 }
 
 GURL DriveApiUrlGenerator::GetAppsListUrl(bool use_internal_endpoint) const {
   return base_url_.Resolve(use_internal_endpoint ?
       kDriveV2InternalAppsUrl : kDriveV2AppsUrl);
@@ skipping 193 matching lines @@
 
   // setModifiedDate is "false" by default.
   if (set_modified_date)
     url = net::AppendOrReplaceQueryParameter(url, "setModifiedDate", "true");
 
   return url;
 }
 
 GURL DriveApiUrlGenerator::GenerateDownloadFileUrl(
     const std::string& resource_id) const {
-  return base_download_url_.Resolve(base::StringPrintf(
+  return base_url_.Resolve(base::StringPrintf(
       kDriveV2DownloadUrlFormat, net::EscapePath(resource_id).c_str()));
 }
 
 GURL DriveApiUrlGenerator::GetPermissionsInsertUrl(
     const std::string& resource_id) const {
   return base_url_.Resolve(
       base::StringPrintf(kDriveV2PermissionsUrlFormat,
                          net::EscapePath(resource_id).c_str()));
 }
 
 GURL DriveApiUrlGenerator::GetThumbnailUrl(const std::string& resource_id,
                                            int width,
                                            int height,
                                            bool crop) const {
   return base_thumbnail_url_.Resolve(
     base::StringPrintf(
         crop ? kDriveV2ThumbnailUrlWithCropFormat : kDriveV2ThumbnailUrlFormat,
         net::EscapePath(resource_id).c_str(), width, height));
 }
 
 GURL DriveApiUrlGenerator::GetBatchUploadUrl() const {
   return base_url_.Resolve(kDriveV2BatchUploadUrl);
 }
 
 }  // namespace google_apis