drive: Replace GetResourceListCallback in DriveServiceInterface with FileListCallback

chrome/browser/sync_file_system/drive_backend_v1/api_util.cc

 // Copyright 2013 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/sync_file_system/drive_backend_v1/api_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <sstream>
 #include <string>
@@ skipping 443 matching lines @@
                             const std::string& directory_resource_id,
                             const ResourceListCallback& callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(!title.empty());
   DVLOG(2) << "Searching resources in the directory [" << directory_resource_id
            << "] with title [" << title << "]";
 
   drive_service_->SearchByTitle(
       title,
       directory_resource_id,
-      base::Bind(&APIUtil::DidGetResourceList, AsWeakPtr(), callback));
+      base::Bind(&APIUtil::DidGetFileList, AsWeakPtr(), callback));
 }
 
 void APIUtil::ListFiles(const std::string& directory_resource_id,
                         const ResourceListCallback& callback) {
   DCHECK(CalledOnValidThread());
   DVLOG(2) << "Listing resources in the directory [" << directory_resource_id
            << "]";
 
-  drive_service_->GetResourceListInDirectory(directory_resource_id, callback);
+  drive_service_->GetFileListInDirectory(
+      directory_resource_id,
+      base::Bind(&APIUtil::DidGetFileList, AsWeakPtr(), callback));
 }
 
 void APIUtil::ListChanges(int64 start_changestamp,
                           const ResourceListCallback& callback) {
   DCHECK(CalledOnValidThread());
   DVLOG(2) << "Listing changes since: " << start_changestamp;
 
   drive_service_->GetChangeList(
       start_changestamp,
       base::Bind(&APIUtil::DidGetChangeList, AsWeakPtr(), callback));
 }
 
 void APIUtil::ContinueListing(const GURL& next_link,
                               const ResourceListCallback& callback) {
   DCHECK(CalledOnValidThread());
   DVLOG(2) << "Continue listing on feed: " << next_link.spec();
 
   drive_service_->GetRemainingFileList(
       next_link,
-      base::Bind(&APIUtil::DidGetResourceList, AsWeakPtr(), callback));
+      base::Bind(&APIUtil::DidGetFileList, AsWeakPtr(), callback));
 }
 
 void APIUtil::DownloadFile(const std::string& resource_id,
                            const std::string& local_file_md5,
                            const DownloadFileCallback& callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(!temp_dir_path_.empty());
   DVLOG(2) << "Downloading file [" << resource_id << "]";
 
   scoped_ptr<webkit_blob::ScopedFile> temp_file(new webkit_blob::ScopedFile);
@@ skipping 164 matching lines @@
     FOR_EACH_OBSERVER(APIUtilObserver, observers_, OnNetworkConnected());
     return;
   }
   // We're now disconnected, reset the drive_uploader_ to force stop
   // uploading, otherwise the uploader may get stuck.
   // TODO(kinuko): Check the uploader behavior if it's the expected behavior
   // (http://crbug.com/223818)
   CancelAllUploads(google_apis::GDATA_NO_CONNECTION);
 }
 
+void APIUtil::DidGetFileList(const ResourceListCallback& callback,
+                             google_apis::GDataErrorCode error,
+                             scoped_ptr<google_apis::FileList> file_list) {
+  DCHECK(CalledOnValidThread());
+
+  if (error != google_apis::HTTP_SUCCESS) {
+    DVLOG(2) << "Error on listing files: " << error;
+    callback.Run(error, scoped_ptr<google_apis::ResourceList>());
+    return;
+  }
+
+  DVLOG(2) << "Got file list";
+  DCHECK(file_list);
+  callback.Run(error, drive::util::ConvertFileListToResourceList(*file_list));
+}
+
 void APIUtil::DidGetChangeList(
     const ResourceListCallback& callback,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::ChangeList> change_list) {
   DCHECK(CalledOnValidThread());
 
   if (error != google_apis::HTTP_SUCCESS) {
     DVLOG(2) << "Error on listing changes: " << error;
     callback.Run(error, scoped_ptr<google_apis::ResourceList>());
     return;
   }
 
   DVLOG(2) << "Got change list";
   DCHECK(change_list);
   callback.Run(error,
                drive::util::ConvertChangeListToResourceList(*change_list));
 }
 
-void APIUtil::DidGetResourceList(
-    const ResourceListCallback& callback,
-    google_apis::GDataErrorCode error,
-    scoped_ptr<google_apis::ResourceList> resource_list) {
-  DCHECK(CalledOnValidThread());
-
-  if (error != google_apis::HTTP_SUCCESS) {
-    DVLOG(2) << "Error on listing resource: " << error;
-    callback.Run(error, scoped_ptr<google_apis::ResourceList>());
-    return;
-  }
-
-  DVLOG(2) << "Got resource list";
-  DCHECK(resource_list);
-  callback.Run(error, resource_list.Pass());
-}
-
 void APIUtil::DidGetResourceEntry(
     const ResourceEntryCallback& callback,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::ResourceEntry> entry) {
   DCHECK(CalledOnValidThread());
 
   if (error != google_apis::HTTP_SUCCESS) {
     DVLOG(2) << "Error on getting resource entry:" << error;
     callback.Run(error, scoped_ptr<google_apis::ResourceEntry>());
     return;
@@ skipping 418 matching lines @@
 }
 
 std::string APIUtil::GetRootResourceId() const {
   if (IsDriveAPIDisabled())
     return drive_service_->GetRootResourceId();
   return root_resource_id_;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system