Fetch files shared in Team Drives by specifying allTeamDrives corpora.

components/drive/service/drive_api_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 "components/drive/service/drive_api_service.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "components/drive/drive_api_util.h"
 #include "google_apis/drive/auth_service.h"
 #include "google_apis/drive/base_requests.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/drive_api_requests.h"
+#include "google_apis/drive/drive_switches.h"
 #include "google_apis/drive/files_list_request_runner.h"
 #include "google_apis/drive/request_sender.h"
 #include "google_apis/google_api_keys.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using google_apis::AboutResourceCallback;
 using google_apis::AppList;
 using google_apis::AppListCallback;
 using google_apis::AuthStatusCallback;
 using google_apis::AuthorizeAppCallback;
 using google_apis::CancelCallback;
 using google_apis::ChangeList;
 using google_apis::ChangeListCallback;
 using google_apis::DRIVE_OTHER_ERROR;
 using google_apis::DRIVE_PARSE_ERROR;
 using google_apis::DownloadActionCallback;
 using google_apis::DriveApiErrorCode;
 using google_apis::EntryActionCallback;
 using google_apis::FileList;
 using google_apis::FileListCallback;
 using google_apis::FileResource;
 using google_apis::FileResourceCallback;
+using google_apis::FilesListCorpora;
 using google_apis::FilesListRequestRunner;
 using google_apis::GetContentCallback;
 using google_apis::GetShareUrlCallback;
 using google_apis::HTTP_NOT_IMPLEMENTED;
 using google_apis::HTTP_SUCCESS;
 using google_apis::InitiateUploadCallback;
 using google_apis::ProgressCallback;
 using google_apis::RequestSender;
 using google_apis::TeamDriveListCallback;
 using google_apis::UploadRangeResponse;
@@ skipping 287 matching lines @@
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!callback.is_null());
 
   std::unique_ptr<FilesListRequest> request =
       base::MakeUnique<FilesListRequest>(sender_.get(), url_generator_,
                                          callback);
   request->set_max_results(kMaxNumFilesResourcePerRequest);
   request->set_q("trashed = false");  // Exclude trashed files.
   request->set_fields(kFileListFields);
+  if (google_apis::GetTeamDrivesIntegrationSwitch() ==
+      google_apis::TEAM_DRIVES_INTEGRATION_ENABLED) {
+    request->set_corpora(google_apis::CORPORA_ALL_TEAM_DRIVES);
+  }
   return sender_->StartRequestWithAuthRetry(std::move(request));
 }
 
 CancelCallback DriveAPIService::GetFileListInDirectory(
     const std::string& directory_resource_id,
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!directory_resource_id.empty());
   DCHECK(!callback.is_null());
 
+  // TODO(yamaguchi): Use FileListScope::CreateForTeamDrive instead of
+  // kAllTeamDrives for efficiency. It'll require to add a new parameter to tell
+  // which team drive the directory resource belongs to.
+  FilesListCorpora corpora = (google_apis::GetTeamDrivesIntegrationSwitch() ==
+                              google_apis::TEAM_DRIVES_INTEGRATION_ENABLED)
+                                 ? google_apis::CORPORA_ALL_TEAM_DRIVES
+                                 : google_apis::CORPORA_DEFAULT;
+
   // Because children.list method on Drive API v2 returns only the list of
   // children's references, but we need all file resource list.
   // So, here we use files.list method instead, with setting parents query.
   // After the migration from GData WAPI to Drive API v2, we should clean the
   // code up by moving the responsibility to include "parents" in the query
   // to client side.
   // We aren't interested in files in trash in this context, neither.
   return files_list_request_runner_->CreateAndStartWithSizeBackoff(
-      kMaxNumFilesResourcePerRequest,
+      kMaxNumFilesResourcePerRequest, corpora, "",

[hashimoto, 2017/06/02 09:44:46]

Use std::string() instead "" to avoid char*->std::string conversion.
The same goes for others.

[yamaguchi, 2017/06/02 12:04:01]

Done.

       base::StringPrintf(
           "'%s' in parents and trashed = false",
           util::EscapeQueryStringValue(directory_resource_id).c_str()),
       kFileListFields, callback);
 }
 
 CancelCallback DriveAPIService::Search(
     const std::string& search_query,
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!search_query.empty());
   DCHECK(!callback.is_null());
 
+  FilesListCorpora corpora = (google_apis::GetTeamDrivesIntegrationSwitch() ==
+                              google_apis::TEAM_DRIVES_INTEGRATION_ENABLED)
+                                 ? google_apis::CORPORA_ALL_TEAM_DRIVES
+                                 : google_apis::CORPORA_DEFAULT;
+
   return files_list_request_runner_->CreateAndStartWithSizeBackoff(
-      kMaxNumFilesResourcePerRequestForSearch,
+      kMaxNumFilesResourcePerRequestForSearch, corpora, "",
       util::TranslateQuery(search_query), kFileListFields, callback);
 }
 
 CancelCallback DriveAPIService::SearchByTitle(
     const std::string& title,
     const std::string& directory_resource_id,
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!title.empty());
   DCHECK(!callback.is_null());
@@ skipping 521 matching lines @@
   // RequestSender before the request is committed because the request has a
   // reference to RequestSender and we should ensure to delete the request when
   // the sender is deleted. Resolve the circulating dependency and fix it.
   const google_apis::CancelCallback callback =
       sender_->StartRequestWithAuthRetry(std::move(request));
   return base::MakeUnique<BatchRequestConfigurator>(
       weak_ref, sender_->blocking_task_runner(), url_generator_, callback);
 }
 
 }  // namespace drive