drive: Replace GetResourceListCallback in DriveServiceInterface with FileListCallback

chrome/browser/sync_file_system/drive_backend_v1/api_util.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
index 62c579fea10cff34a81638eb366603a06396cefd..02dec0fc48e806d4ba57891aac394372ed9bf6f5 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
@@ -461,7 +461,7 @@ void APIUtil::SearchByTitle(const std::string& 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,
@@ -470,7 +470,9 @@ void APIUtil::ListFiles(const std::string& directory_resource_id,
   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,
@@ -490,7 +492,7 @@ void APIUtil::ContinueListing(const GURL& next_link,
 
   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,
@@ -675,39 +677,38 @@ void APIUtil::OnConnectionTypeChanged(
   CancelAllUploads(google_apis::GDATA_NO_CONNECTION);
 }
 
-void APIUtil::DidGetChangeList(
-    const ResourceListCallback& callback,
-    google_apis::GDataErrorCode error,
-    scoped_ptr<google_apis::ChangeList> change_list) {
+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 changes: " << error;
+    DVLOG(2) << "Error on listing files: " << 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));
+  DVLOG(2) << "Got file list";
+  DCHECK(file_list);
+  callback.Run(error, drive::util::ConvertFileListToResourceList(*file_list));
 }
 
-void APIUtil::DidGetResourceList(
+void APIUtil::DidGetChangeList(
     const ResourceListCallback& callback,
     google_apis::GDataErrorCode error,
-    scoped_ptr<google_apis::ResourceList> resource_list) {
+    scoped_ptr<google_apis::ChangeList> change_list) {
   DCHECK(CalledOnValidThread());
 
   if (error != google_apis::HTTP_SUCCESS) {
-    DVLOG(2) << "Error on listing resource: " << error;
+    DVLOG(2) << "Error on listing changes: " << error;
     callback.Run(error, scoped_ptr<google_apis::ResourceList>());
     return;
   }
 
-  DVLOG(2) << "Got resource list";
-  DCHECK(resource_list);
-  callback.Run(error, resource_list.Pass());
+  DVLOG(2) << "Got change list";
+  DCHECK(change_list);
+  callback.Run(error,
+               drive::util::ConvertChangeListToResourceList(*change_list));
 }
 
 void APIUtil::DidGetResourceEntry(