drive: Replace GetResourceListCallback in DriveServiceInterface with FileListCallback

chrome/browser/chromeos/drive/job_scheduler.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 "chrome/browser/chromeos/drive/job_scheduler.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 257 matching lines @@
   StartJob(new_job);
 }
 
 void JobScheduler::GetAllResourceList(
     const google_apis::GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   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));
   new_job->abort_callback = CreateErrorRunCallback(callback);
   StartJob(new_job);
 }
 
 void JobScheduler::GetResourceListInDirectory(
     const std::string& directory_resource_id,
     const google_apis::GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   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));
   new_job->abort_callback = CreateErrorRunCallback(callback);
   StartJob(new_job);
 }
 
 void JobScheduler::Search(
     const std::string& search_query,
     const google_apis::GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   JobEntry* new_job = CreateNewJob(TYPE_SEARCH);
   new_job->task = base::Bind(
       &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));
   new_job->abort_callback = CreateErrorRunCallback(callback);
   StartJob(new_job);
 }
 
 void JobScheduler::GetChangeList(
     int64 start_changestamp,
     const google_apis::GetResourceListCallback& callback) {
@@ skipping 36 matching lines @@
     const GURL& next_link,
     const google_apis::GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   JobEntry* new_job = CreateNewJob(TYPE_GET_REMAINING_FILE_LIST);
   new_job->task = base::Bind(
       &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));
   new_job->abort_callback = CreateErrorRunCallback(callback);
   StartJob(new_job);
 }
 
 void JobScheduler::GetResourceEntry(
     const std::string& resource_id,
     const ClientContext& context,
@@ skipping 505 matching lines @@
 
   // Post a task to continue the job loop.  This allows us to finish handling
   // the current job before starting the next one.
   base::MessageLoopProxy::current()->PostTask(FROM_HERE,
       base::Bind(&JobScheduler::DoJobLoop,
                  weak_ptr_factory_.GetWeakPtr(),
                  queue_type));
   return !should_retry;
 }
 
+void JobScheduler::OnGetFileListJobDone(
+    JobID job_id,
+    const google_apis::GetResourceListCallback& callback,
+    google_apis::GDataErrorCode error,
+    scoped_ptr<google_apis::FileList> file_list) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
+  if (OnJobDone(job_id, error)) {
+    callback.Run(error, file_list ?
+                 util::ConvertFileListToResourceList(*file_list) :
+                 scoped_ptr<google_apis::ResourceList>());
+  }
+}
+
 void JobScheduler::OnGetChangeListJobDone(
     JobID job_id,
     const google_apis::GetResourceListCallback& callback,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::ChangeList> change_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (OnJobDone(job_id, error)) {
     callback.Run(error, change_list ?
                  util::ConvertChangeListToResourceList(*change_list) :
                  scoped_ptr<google_apis::ResourceList>());
 
   }
 }
 
-void JobScheduler::OnGetResourceListJobDone(
-    JobID job_id,
-    const google_apis::GetResourceListCallback& callback,
-    google_apis::GDataErrorCode error,
-    scoped_ptr<google_apis::ResourceList> resource_list) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!callback.is_null());
-
-  if (OnJobDone(job_id, error))
-    callback.Run(error, resource_list.Pass());
-}
-
 void JobScheduler::OnGetResourceEntryJobDone(
     JobID job_id,
     const google_apis::GetResourceEntryCallback& callback,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (OnJobDone(job_id, error))
     callback.Run(error, entry.Pass());
@@ skipping 222 matching lines @@
     case FILE_QUEUE:
       return "FILE_QUEUE";
     case NUM_QUEUES:
       break;  // This value is just a sentinel. Should never be used.
   }
   NOTREACHED();
   return "";
 }
 
 }  // namespace drive