drive: Stop returning ResourceList from JobScheduler

chrome/browser/chromeos/drive/directory_loader.cc

 // Copyright 2014 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/directory_loader.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h"
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/drive_api_parser.h"
-#include "google_apis/drive/gdata_wapi_parser.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace internal {
 
 namespace {
 
 // Minimum changestamp gap required to start loading directory.
@@ skipping 75 matching lines @@
   }
 
   void Run(const FileOperationCallback& callback) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!callback.is_null());
     DCHECK(!directory_fetch_info_.resource_id().empty());
 
     // Remember the time stamp for usage stats.
     start_time_ = base::TimeTicks::Now();
 
-    loader_->scheduler_->GetResourceListInDirectory(
+    loader_->scheduler_->GetFileListInDirectory(
         directory_fetch_info_.resource_id(),
-        base::Bind(&FeedFetcher::OnResourceListFetched,
+        base::Bind(&FeedFetcher::OnFileListFetched,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
-  void OnResourceListFetched(
-      const FileOperationCallback& callback,
-      google_apis::GDataErrorCode status,
-      scoped_ptr<google_apis::ResourceList> resource_list) {
+  void OnFileListFetched(const FileOperationCallback& callback,
+                         google_apis::GDataErrorCode status,
+                         scoped_ptr<google_apis::FileList> file_list) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!callback.is_null());
 
     FileError error = GDataToFileError(status);
     if (error != FILE_ERROR_OK) {
       callback.Run(error);
       return;
     }
 
-    DCHECK(resource_list);
-    scoped_ptr<ChangeList> change_list(new ChangeList(*resource_list));
-
-    GURL next_url;
-    resource_list->GetNextFeedURL(&next_url);
+    DCHECK(file_list);
+    scoped_ptr<ChangeList> change_list(new ChangeList(*file_list));
+    GURL next_url = file_list->next_link();
 
     ResourceEntryVector* entries = new ResourceEntryVector;
     loader_->loader_controller_->ScheduleRun(base::Bind(
         base::IgnoreResult(
             &base::PostTaskAndReplyWithResult<FileError, FileError>),
         loader_->blocking_task_runner_,
         FROM_HERE,
         base::Bind(&ChangeListProcessor::RefreshDirectory,
                    loader_->resource_metadata_,
                    directory_fetch_info_,
@@ skipping 18 matching lines @@
       callback.Run(error);
       return;
     }
 
     loader_->SendEntries(directory_fetch_info_.local_id(), *refreshed_entries);
 
     if (!next_url.is_empty()) {
       // There is the remaining result so fetch it.
       loader_->scheduler_->GetRemainingFileList(
           next_url,
-          base::Bind(&FeedFetcher::OnResourceListFetched,
+          base::Bind(&FeedFetcher::OnFileListFetched,
                      weak_ptr_factory_.GetWeakPtr(), callback));
       return;
     }
 
     UMA_HISTOGRAM_TIMES("Drive.DirectoryFeedLoadTime",
                         base::TimeTicks::Now() - start_time_);
 
     // Note: The fetcher is managed by DirectoryLoader, and the instance
     // will be deleted in the callback. Do not touch the fields after this
     // invocation.
@@ skipping 380 matching lines @@
 
   // Also notify the observers.
   if (error == FILE_ERROR_OK && !directory_path->empty()) {
     FOR_EACH_OBSERVER(ChangeListLoaderObserver, observers_,
                       OnDirectoryChanged(*directory_path));
   }
 }
 
 }  // namespace internal
 }  // namespace drive