drive: Some cleanup for ChangeListLoader

chrome/browser/chromeos/drive/change_list_loader.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_
 
 #include <queue>
 #include <string>
 #include <utility>
@@ skipping 118 matching lines @@
   void ScheduleRun(const DirectoryFetchInfo& directory_fetch_info,
                    const FileOperationCallback& callback);
 
   // Indicates whether there is a feed refreshing server request is in flight.
   bool refreshing() const { return refreshing_; }
 
  private:
   struct GetResourceListUiState;
   struct LoadFeedParams;
   struct LoadRootFeedParams;
-  struct UpdateMetadataParams;
 
   // Part of Load(). Called after loading from the cache is complete.
   void LoadAfterLoadFromCache(
       const DirectoryFetchInfo directory_fetch_info,
       const FileOperationCallback& callback,
       DriveFileError error);
 
-  // Starts root feed load from the server, with details specified in |params|.
-  void LoadFromServer(scoped_ptr<LoadFeedParams> params);
+  // Starts loading from the server, with details specified in |params|. This
+  // is a general purpuse function, which is used for loading change lists,
+  // full resource lists, and directory contents.
+  void LoadFromServer(scoped_ptr<LoadFeedParams> params,
+                      const LoadFeedListCallback& callback);
+
+  // Part of LoadFromServer. Called when DriveScheduler::GetResourceList() is
+  // complete. |callback| must not be null.
+  void LoadFromServerAfterGetResourceList(
+      scoped_ptr<LoadFeedParams> params,
+      const LoadFeedListCallback& callback,
+      base::TimeTicks start_time,
+      google_apis::GDataErrorCode status,
+      scoped_ptr<google_apis::ResourceList> data);
 
   // Part of LoadDirectoryFromServer() Callled when
   // DriveScheduler::GetAboutResource() is complete. Calls
   // DoLoadDirectoryFromServer() to initiate the directory contents loading.
   void LoadDirectoryFromServerAfterGetAbout(
       const std::string& directory_resource_id,
       const FileOperationCallback& callback,
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
@@ skipping 32 matching lines @@
       scoped_ptr<google_apis::AboutResource> about_resource);
 
   // Compares |remote_changestamp| and |local_changestamp| and triggers
   // LoadFromServer if necessary.
   void CompareChangestampsAndLoadIfNeeded(
       const DirectoryFetchInfo& directory_fetch_info,
       const FileOperationCallback& callback,
       int64 remote_changestamp,
       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.
+  void LoadChangeListFromServer(
+      int64 start_changestamp,
+      int64 remote_changestamp,
+      const FileOperationCallback& callback);
+
   // Callback for handling response from |DriveAPIService::GetAppList|.
   // If the application list is successfully parsed, passes the list to
   // Drive webapps registry.
   void OnGetAppList(google_apis::GDataErrorCode status,
                     scoped_ptr<google_apis::AppList> app_list);
 
   // Callback for handling feed content fetching while searching for file info.
   // This callback is invoked after async feed fetch operation that was
   // invoked by StartDirectoryRefresh() completes. This callback will update
   // the content of the refreshed directory object and continue initially
   // started FindEntryByPath() request.
   void UpdateMetadataFromFeedAfterLoadFromServer(
-      const UpdateMetadataParams& params,
+      bool is_delta_feed,
+      int64 feed_changestamp,
+      const FileOperationCallback& callback,
       const ScopedVector<google_apis::ResourceList>& feed_list,
       DriveFileError error);
 
-  // Callback for handling response from |GDataWapiService::GetResourceList|.
-  // Invokes |callback| when done.
-  // |callback| must not be null.
-  void OnGetResourceList(scoped_ptr<LoadFeedParams> params,
-                         base::TimeTicks start_time,
-                         google_apis::GDataErrorCode status,
-                         scoped_ptr<google_apis::ResourceList> data);
-
   // Save filesystem to disk.
   void SaveFileSystem();
 
   // Callback for handling UI updates caused by feed fetching.
   void OnNotifyResourceListFetched(
       base::WeakPtr<GetResourceListUiState> ui_state);
 
   // Callback for ChangeListProcessor::ApplyFeeds.
   void NotifyDirectoryChanged(bool should_notify,
                               const base::Closure& update_finished_callback);
@@ skipping 26 matching lines @@
 
   // 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_;
   DISALLOW_COPY_AND_ASSIGN(ChangeListLoader);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_