Make DriveFeedProcessor asynchronous.

chrome/browser/chromeos/drive/drive_feed_processor.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_DRIVE_FEED_PROCESSOR_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FEED_PROCESSOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 61 matching lines @@
   void ApplyEntryProtoMap(bool is_delta_feed, int64 feed_changestamp);
 
   // Apply the next item from entry_proto_map_ to the file system. The async
   // version posts to the message loop to avoid recursive stack-overflow.
   void ApplyNextEntryProto();
   void ApplyNextEntryProtoAsync();
 
   // Apply |entry_proto| to resource_metadata_.
   void ApplyEntryProto(const DriveEntryProto& entry_proto);
 
+  // Continue ApplyEntryProto. This is a callback for
+  // DriveResourceMetadata::GetEntryInfoByResourceId.
+  void ContinueApplyEntryProto(
+      const DriveEntryProto& entry_proto,
+      DriveFileError error,
+      const FilePath& drive_file_path,
+      scoped_ptr<DriveEntryProto> old_entry_proto);
+
   // Apply the DriveEntryProto pointed to by |it| to resource_metadata_.
   void ApplyNextByIterator(DriveEntryProtoMap::iterator it);
 
-  // Helper function for adding an |entry| from the feed to its new parent.
-  // changed_dirs_ are updated if this operation needs to raise a directory
-  // change notification.
+  // TODO(achuith): Delete this.
   void AddEntryToParent(DriveEntry* entry);
 
-  // Helper function for removing |entry| from its parent.
-  // changed_dirs_ are updated if this operation needs to raise a directory
-  // change notification, including child directories.
+  // Helper function to add |entry_proto| to its parent. Updates changed_dirs_
+  // as a side effect.
+  void AddEntryToParent(const DriveEntryProto& entry_proto);

[hashimoto, 2012/11/14 10:15:56]

Our coding style discourages function overloading. Could you rename at least one
of these two AddEntryToParent?

[achuithb, 2012/11/14 11:11:29]

Renamed to AddEntryToParentDeprecated. This will be gone in the next CL along
with other dependencies on drive_files.h.

+
+  // Callback for DriveResourceMetadata::AddEntryToParent.
+  void NotifyForAddEntryToParent(bool is_directory,
+                                 DriveFileError error,
+                                 const FilePath& file_path);
+
+  // TODO(achuith): Delete this.
   void RemoveEntryFromParent(DriveEntry* entry);
 
+  // Removes entry pointed to by |resource_id| from its parent. Updates
+  // changed_dirs_ as a side effect.
+  void RemoveEntryFromParent(const std::string& resource_id);
+
+  // Continues RemoveEntryFromParent after
+  // DriveResourceMetadata::GetChildDirectories.
+  void ContinueRemoveEntryFromParent(
+      const std::string& resource_id,
+      const std::set<FilePath>& changed_directories);
+
+  // Callback for DriveResourceMetadata::RemoveEntryFromParent.
+  void NotifyForRemoveEntryFromParent(
+      const std::set<FilePath>& changed_directories,
+      DriveFileError error,
+      const FilePath& file_path);
+
+  // Refreshes DriveResourceMetadata entry that has the same resource_id as
+  // |entry_proto| with |entry_proto|. Updates changed_dirs_ as a side effect.
+  void RefreshEntryProto(const DriveEntryProto& entry_proto);
+
+  // Continues Refresh after DriveResourceMetadata::GetChangedDirectories.
+  void ContinueRefreshEntryProto(const DriveEntryProto& entry_proto,
+                                 const std::set<FilePath>& changed_directories);
+
+  // Callback for DriveResourceMetadata::RefreshEntryProto.
+  void NotifyForRefreshEntryProto(
+      const std::set<FilePath>& changed_directories,
+      DriveFileError error,
+      const FilePath& file_path,
+      scoped_ptr<DriveEntryProto> entry_proto);
+
   // Resolves parent directory for |new_entry| from the feed.
+  // TODO(achuith): Delete this.
   DriveDirectory* ResolveParent(DriveEntry* new_entry);
 
   // Reset the state of this object.
   void Clear();
 
   DriveResourceMetadata* resource_metadata_;  // Not owned.
 
   DriveEntryProtoMap entry_proto_map_;
   std::set<FilePath> changed_dirs_;
   base::Closure on_complete_callback_;
 
   // 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<DriveFeedProcessor> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(DriveFeedProcessor);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FEED_PROCESSOR_H_