drive: Replace GetResourceListCallback in DriveServiceInterface with FileListCallback

chrome/browser/chromeos/drive/job_scheduler.cc

Index: chrome/browser/chromeos/drive/job_scheduler.cc
diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc
index 9ad788682264a4ff6f6a033a18ea9ac0b9a1bff4..6bbfda866e263b1ec5973474b4b9d4da8aa4fb1d 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler.cc
@@ -275,9 +275,9 @@ void JobScheduler::GetAllResourceList(
 
   JobEntry* new_job = CreateNewJob(TYPE_GET_ALL_RESOURCE_LIST);
   new_job->task = base::Bind(
-      &DriveServiceInterface::GetAllResourceList,
+      &DriveServiceInterface::GetAllFileList,
       base::Unretained(drive_service_),
-      base::Bind(&JobScheduler::OnGetResourceListJobDone,
+      base::Bind(&JobScheduler::OnGetFileListJobDone,
                  weak_ptr_factory_.GetWeakPtr(),
                  new_job->job_info.job_id,
                  callback));
@@ -294,10 +294,10 @@ void JobScheduler::GetResourceListInDirectory(
   JobEntry* new_job = CreateNewJob(
       TYPE_GET_RESOURCE_LIST_IN_DIRECTORY);
   new_job->task = base::Bind(
-      &DriveServiceInterface::GetResourceListInDirectory,
+      &DriveServiceInterface::GetFileListInDirectory,
       base::Unretained(drive_service_),
       directory_resource_id,
-      base::Bind(&JobScheduler::OnGetResourceListJobDone,
+      base::Bind(&JobScheduler::OnGetFileListJobDone,
                  weak_ptr_factory_.GetWeakPtr(),
                  new_job->job_info.job_id,
                  callback));
@@ -316,7 +316,7 @@ void JobScheduler::Search(
       &DriveServiceInterface::Search,
       base::Unretained(drive_service_),
       search_query,
-      base::Bind(&JobScheduler::OnGetResourceListJobDone,
+      base::Bind(&JobScheduler::OnGetFileListJobDone,
                  weak_ptr_factory_.GetWeakPtr(),
                  new_job->job_info.job_id,
                  callback));
@@ -373,7 +373,7 @@ void JobScheduler::GetRemainingFileList(
       &DriveServiceInterface::GetRemainingFileList,
       base::Unretained(drive_service_),
       next_link,
-      base::Bind(&JobScheduler::OnGetResourceListJobDone,
+      base::Bind(&JobScheduler::OnGetFileListJobDone,
                  weak_ptr_factory_.GetWeakPtr(),
                  new_job->job_info.job_id,
                  callback));
@@ -899,32 +899,35 @@ bool JobScheduler::OnJobDone(JobID job_id, google_apis::GDataErrorCode error) {
   return !should_retry;
 }
 
-void JobScheduler::OnGetChangeListJobDone(
+void JobScheduler::OnGetFileListJobDone(
     JobID job_id,
     const google_apis::GetResourceListCallback& callback,
     google_apis::GDataErrorCode error,
-    scoped_ptr<google_apis::ChangeList> change_list) {
+    scoped_ptr<google_apis::FileList> file_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (OnJobDone(job_id, error)) {
-    callback.Run(error, change_list ?
-                 util::ConvertChangeListToResourceList(*change_list) :
+    callback.Run(error, file_list ?
+                 util::ConvertFileListToResourceList(*file_list) :
                  scoped_ptr<google_apis::ResourceList>());
-
   }
 }
 
-void JobScheduler::OnGetResourceListJobDone(
+void JobScheduler::OnGetChangeListJobDone(
     JobID job_id,
     const google_apis::GetResourceListCallback& callback,
     google_apis::GDataErrorCode error,
-    scoped_ptr<google_apis::ResourceList> resource_list) {
+    scoped_ptr<google_apis::ChangeList> change_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  if (OnJobDone(job_id, error))
-    callback.Run(error, resource_list.Pass());
+  if (OnJobDone(job_id, error)) {
+    callback.Run(error, change_list ?
+                 util::ConvertChangeListToResourceList(*change_list) :
+                 scoped_ptr<google_apis::ResourceList>());
+
+  }
 }
 
 void JobScheduler::OnGetResourceEntryJobDone(