drive: Stop returning ResourceList from JobScheduler

chrome/browser/chromeos/drive/change_list_loader.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/change_list_loader.h"
 
 #include <set>
 
 #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_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 {
 
 typedef base::Callback<void(FileError, ScopedVector<ChangeList>)>
     FeedFetcherCallback;
 
@@ skipping 17 matching lines @@
   }
 
   virtual void Run(const FeedFetcherCallback& callback) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!callback.is_null());
 
     // Remember the time stamp for usage stats.
     start_time_ = base::TimeTicks::Now();
 
     // This is full resource list fetch.
-    scheduler_->GetAllResourceList(
+    scheduler_->GetAllFileList(
         base::Bind(&FullFeedFetcher::OnFileListFetched,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
-  void OnFileListFetched(
-      const FeedFetcherCallback& callback,
-      google_apis::GDataErrorCode status,
-      scoped_ptr<google_apis::ResourceList> resource_list) {
+  void OnFileListFetched(const FeedFetcherCallback& 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, ScopedVector<ChangeList>());
       return;
     }
 
-    DCHECK(resource_list);
-    change_lists_.push_back(new ChangeList(*resource_list));
+    DCHECK(file_list);
+    change_lists_.push_back(new ChangeList(*file_list));
 
-    GURL next_url;
-    if (resource_list->GetNextFeedURL(&next_url) && !next_url.is_empty()) {
+    if (!file_list->next_link().is_empty()) {
       // There is the remaining result so fetch it.
       scheduler_->GetRemainingFileList(
-          next_url,
+          file_list->next_link(),
           base::Bind(&FullFeedFetcher::OnFileListFetched,
                      weak_ptr_factory_.GetWeakPtr(), callback));
       return;
     }
 
     UMA_HISTOGRAM_LONG_TIMES("Drive.FullFeedLoadTime",
                              base::TimeTicks::Now() - start_time_);
 
     // Note: The fetcher is managed by ChangeListLoader, and the instance
     // will be deleted in the callback. Do not touch the fields after this
@@ skipping 24 matching lines @@
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!callback.is_null());
 
     scheduler_->GetChangeList(
         start_change_id_,
         base::Bind(&DeltaFeedFetcher::OnChangeListFetched,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
-  void OnChangeListFetched(
-      const FeedFetcherCallback& callback,
-      google_apis::GDataErrorCode status,
-      scoped_ptr<google_apis::ResourceList> resource_list) {
+  void OnChangeListFetched(const FeedFetcherCallback& callback,
+                           google_apis::GDataErrorCode status,
+                           scoped_ptr<google_apis::ChangeList> change_list) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!callback.is_null());
 
     FileError error = GDataToFileError(status);
     if (error != FILE_ERROR_OK) {
       callback.Run(error, ScopedVector<ChangeList>());
       return;
     }
 
-    DCHECK(resource_list);
-    change_lists_.push_back(new ChangeList(*resource_list));
+    DCHECK(change_list);
+    change_lists_.push_back(new ChangeList(*change_list));
 
-    GURL next_url;
-    if (resource_list->GetNextFeedURL(&next_url) && !next_url.is_empty()) {
+    if (!change_list->next_link().is_empty()) {
       // There is the remaining result so fetch it.
       scheduler_->GetRemainingChangeList(
-          next_url,
+          change_list->next_link(),
           base::Bind(&DeltaFeedFetcher::OnChangeListFetched,
                      weak_ptr_factory_.GetWeakPtr(), callback));
       return;
     }
 
     // Note: The fetcher is managed by ChangeListLoader, and the instance
     // will be deleted in the callback. Do not touch the fields after this
     // invocation.
     callback.Run(FILE_ERROR_OK, change_lists_.Pass());
   }
@@ skipping 377 matching lines @@
 
   OnChangeListLoadComplete(error);
 
   FOR_EACH_OBSERVER(ChangeListLoaderObserver,
                     observers_,
                     OnLoadFromServerComplete());
 }
 
 }  // namespace internal
 }  // namespace drive