drive: Pass through AboutResouce from server among callbacks in ChangeListLoader.

chrome/browser/chromeos/drive/change_list_loader.h

Index: chrome/browser/chromeos/drive/change_list_loader.h
diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h
index ea640f140c8cf4dcc9320fa338d1fe3d875d794d..070db50aa562b872eeb7127c5df4bcd2e9e9a567 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.h
+++ b/chrome/browser/chromeos/drive/change_list_loader.h
@@ -114,12 +114,13 @@ class ChangeListLoader {
   // Record file statistics as UMA histograms.
   //
   // See comments at ChangeListProcessor::ApplyFeeds() for
-  // |is_delta_feed| and |root_feed_changestamp|.
+  // |about_resource| and |is_delta_feed|.
   // |update_finished_callback| must not be null.
-  void UpdateFromFeed(const ScopedVector<google_apis::ResourceList>& feed_list,
-                      bool is_delta_feed,
-                      int64 root_feed_changestamp,
-                      const base::Closure& update_finished_callback);
+  void UpdateFromFeed(
+      scoped_ptr<google_apis::AboutResource> about_resource,
+      const ScopedVector<google_apis::ResourceList>& feed_list,
+      bool is_delta_feed,
+      const base::Closure& update_finished_callback);
 
   // Schedules |callback| to run when it's ready (i.e. the change list
   // loading is complete or the directory specified by |directory_fetch_info|
@@ -201,21 +202,22 @@ class ChangeListLoader {
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
-  // Compares |remote_changestamp| and |local_changestamp| and triggers
+  // Compares the largetst_change_id in |about_resource| and |local_changestamp|
+  // and triggers
   // LoadFromServer if necessary.
   void CompareChangestampsAndLoadIfNeeded(
       const DirectoryFetchInfo& directory_fetch_info,
       const FileOperationCallback& callback,
-      int64 remote_changestamp,
+      scoped_ptr<google_apis::AboutResource> about_resource,
       int64 local_changestamp);
 
   // Starts loading the change list since |start_changestamp|, or the full
-  // resource list if |start_changestamp| is zero. |remote_changestamp| will
-  // be stored in DriveResourceMetadata, once loading is done.
-  // callback must not be null.
+  // resource list if |start_changestamp| is zero. For full update, the
+  // largest_change_id and root_folder_id from |about_resource| will be used.
+  // |callback| must not be null.
   void LoadChangeListFromServer(
+      scoped_ptr<google_apis::AboutResource> about_resource,
       int64 start_changestamp,
-      int64 remote_changestamp,
       const FileOperationCallback& callback);
 
   // Callback for handling response from |DriveAPIService::GetAppList|.
@@ -230,8 +232,8 @@ class ChangeListLoader {
   // the content of the refreshed directory object and continue initially
   // started FindEntryByPath() request.
   void UpdateMetadataFromFeedAfterLoadFromServer(
+      scoped_ptr<google_apis::AboutResource> about_resource,
       bool is_delta_feed,
-      int64 feed_changestamp,
       const FileOperationCallback& callback,
       const ScopedVector<google_apis::ResourceList>& feed_list,
       DriveFileError error);
@@ -273,6 +275,10 @@ class ChangeListLoader {
   // Indicates whether there is a feed refreshing server request is in flight.
   bool refreshing_;
 
+  // Resource ID for the user's "My Drive" root. This must be retrieved from

[hidehiko, 2013/03/18 06:22:27]

Don't need?

[Haruki Sato, 2013/03/18 07:06:41]

Done. Thanks.

+  // the server.
+  // std::string drive_root_resource_id_;
+
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ChangeListLoader> weak_ptr_factory_;