Use Drive v2 API for team drive operations.

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/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/drive/drive_switches.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/url_util.h"
 
 namespace google_apis {
 
 namespace {
 
 // Hard coded URLs for communication with a google drive server.
 // TODO(yamaguchi): Make a utility function to compose some of these URLs by a
 // version and a resource name.
 const char kDriveV2AboutUrl[] = "drive/v2/about";
 const char kDriveV2AppsUrl[] = "drive/v2/apps";
 const char kDriveV2ChangelistUrl[] = "drive/v2/changes";
-const char kDriveV2BetaChangelistUrl[] = "drive/v2beta/changes";
 const char kDriveV2FilesUrl[] = "drive/v2/files";
-const char kDriveV2BetaFilesUrl[] = "drive/v2beta/files";
 const char kDriveV2FileUrlPrefix[] = "drive/v2/files/";
-const char kDriveV2BetaFileUrlPrefix[] = "drive/v2beta/files/";
 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";
@@ skipping 58 matching lines @@
   return base_url_.Resolve(base::StringPrintf(
       kDriveV2AppsDeleteUrlFormat, net::EscapePath(app_id).c_str()));
 }
 
 GURL DriveApiUrlGenerator::GetFilesGetUrl(const std::string& file_id,
                                           bool use_internal_endpoint,
                                           const GURL& embed_origin) const {
   const char* url_prefix = nullptr;
   if (use_internal_endpoint)
     url_prefix = kDriveV2InternalFileUrlPrefix;
-  else if (enable_team_drives_)
-    url_prefix = kDriveV2BetaFileUrlPrefix;
   else
     url_prefix = kDriveV2FileUrlPrefix;
 
   GURL url = base_url_.Resolve(url_prefix + net::EscapePath(file_id));
 
   if (enable_team_drives_)
     url = net::AppendOrReplaceQueryParameter(url, kSupportsTeamDrives, "true");
 
   if (!embed_origin.is_empty()) {
     // Construct a valid serialized embed origin from an url, according to
@@ skipping 53 matching lines @@
 
   if (!visibility.empty())
     url = net::AppendOrReplaceQueryParameter(url, "visibility", visibility);
 
   return url;
 }
 
 GURL DriveApiUrlGenerator::GetFilesListUrl(int max_results,
                                            const std::string& page_token,
                                            const std::string& q) const {
-  GURL url;
+  GURL url = base_url_.Resolve(kDriveV2FilesUrl);
   if (enable_team_drives_) {
-    url = base_url_.Resolve(kDriveV2BetaFilesUrl);
     url = net::AppendOrReplaceQueryParameter(url, kSupportsTeamDrives, "true");
     url = net::AppendOrReplaceQueryParameter(url, kIncludeTeamDriveItems,
                                              "true");
-  } else {
-    url = base_url_.Resolve(kDriveV2FilesUrl);
   }
   // maxResults is 100 by default.
   if (max_results != 100) {
     url = net::AppendOrReplaceQueryParameter(
         url, "maxResults", base::IntToString(max_results));
   }
 
   if (!page_token.empty())
     url = net::AppendOrReplaceQueryParameter(url, "pageToken", page_token);
 
@@ skipping 12 matching lines @@
   return base_url_.Resolve(base::StringPrintf(
       kDriveV2FileTrashUrlFormat, net::EscapePath(file_id).c_str()));
 }
 
 GURL DriveApiUrlGenerator::GetChangesListUrl(bool include_deleted,
                                              int max_results,
                                              const std::string& page_token,
                                              int64_t start_change_id) const {
   DCHECK_GE(start_change_id, 0);
 
-  GURL url;
+  GURL url = base_url_.Resolve(kDriveV2ChangelistUrl);
   if (enable_team_drives_) {
-    url = base_url_.Resolve(kDriveV2BetaChangelistUrl);
     url = net::AppendOrReplaceQueryParameter(url, kSupportsTeamDrives, "true");
     url = net::AppendOrReplaceQueryParameter(url, kIncludeTeamDriveItems,
                                              "true");
-  } else {
-    url = base_url_.Resolve(kDriveV2ChangelistUrl);
   }
   // includeDeleted is "true" by default.
   if (!include_deleted)
     url = net::AppendOrReplaceQueryParameter(url, "includeDeleted", "false");
 
   // maxResults is "100" by default.
   if (max_results != 100) {
     url = net::AppendOrReplaceQueryParameter(
         url, "maxResults", base::IntToString(max_results));
   }
@@ skipping 97 matching lines @@
     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