drive: Remove mentions of "feed" in ChangeListProcessor

The term "feed" is irrelevant with Drive API, hence should not be
used in code.

BUG=165395
TEST=none
R=hashimoto@chromium.org

Review URL: https://codereview.chromium.org/16023028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203654 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 36 insertions, 36 deletions

diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc
index dcbbc35..d699ba7 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.cc
+++ b/chrome/browser/chromeos/drive/change_list_loader.cc
@@ -130,7 +130,7 @@ void ChangeListLoader::UpdateFromChangeList(
   util::Log("Apply change lists (is delta: %d)", is_delta_update);
   blocking_task_runner_->PostTaskAndReply(
       FROM_HERE,
-      base::Bind(&ChangeListProcessor::ApplyFeeds,
+      base::Bind(&ChangeListProcessor::Apply,
                  base::Unretained(change_list_processor),
                  base::Passed(&about_resource),
                  base::Passed(&change_lists),
@@ -654,7 +654,7 @@ void ChangeListLoader::DoLoadDirectoryFromServerAfterLoad(
   }
 
   ChangeListProcessor::ResourceEntryMap entry_map;
-  ChangeListProcessor::FeedToEntryMap(change_lists.Pass(), &entry_map, NULL);
+  ChangeListProcessor::ConvertToMap(change_lists.Pass(), &entry_map, NULL);
   resource_metadata_->RefreshDirectoryOnUIThread(
       directory_fetch_info,
       entry_map,
diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc
index fc6e3b7..dca1771 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor.cc
@@ -70,14 +70,14 @@ ChangeListProcessor::ChangeListProcessor(ResourceMetadata* resource_metadata)
 ChangeListProcessor::~ChangeListProcessor() {
 }
 
-void ChangeListProcessor::ApplyFeeds(
+void ChangeListProcessor::Apply(
     scoped_ptr<google_apis::AboutResource> about_resource,
     ScopedVector<ChangeList> change_lists,
-    bool is_delta_feed) {
-  DCHECK(is_delta_feed || about_resource.get());
+    bool is_delta_update) {
+  DCHECK(is_delta_update || about_resource.get());
 
   int64 largest_changestamp = 0;
-  if (is_delta_feed) {
+  if (is_delta_update) {
     if (!change_lists.empty()) {
       // The changestamp appears in the first page of the change list.
       // The changestamp does not appear in the full resource list.
@@ -95,7 +95,7 @@ void ChangeListProcessor::ApplyFeeds(
   }
 
   ChangeListToEntryMapUMAStats uma_stats;
-  FeedToEntryMap(change_lists.Pass(), &entry_map_, &uma_stats);
+  ConvertToMap(change_lists.Pass(), &entry_map_, &uma_stats);
 
   // Add the largest changestamp for directories.
   for (ResourceEntryMap::iterator it = entry_map_.begin();
@@ -106,7 +106,7 @@ void ChangeListProcessor::ApplyFeeds(
     }
   }
 
-  ApplyEntryMap(is_delta_feed, about_resource.Pass());
+  ApplyEntryMap(is_delta_update, about_resource.Pass());
 
   // Update the root entry and finish.
   UpdateRootEntry(largest_changestamp);
@@ -117,15 +117,15 @@ void ChangeListProcessor::ApplyFeeds(
   DLOG_IF(ERROR, error != FILE_ERROR_OK) << "SetLargestChangeStamp failed: "
                                          << FileErrorToString(error);
 
-  // Shouldn't record histograms when processing delta feeds.
-  if (!is_delta_feed)
+  // Shouldn't record histograms when processing delta update.
+  if (!is_delta_update)
     uma_stats.UpdateFileCountUmaHistograms();
 }
 
 void ChangeListProcessor::ApplyEntryMap(
-    bool is_delta_feed,
+    bool is_delta_update,
     scoped_ptr<google_apis::AboutResource> about_resource) {
-  if (!is_delta_feed) {  // Full update.
+  if (!is_delta_update) {  // Full update.
     DCHECK(about_resource);
 
     FileError error = resource_metadata_->Reset();
@@ -251,7 +251,7 @@ void ChangeListProcessor::RefreshEntry(const ResourceEntry& entry) {
 }
 
 // static
-void ChangeListProcessor::FeedToEntryMap(
+void ChangeListProcessor::ConvertToMap(
     ScopedVector<ChangeList> change_lists,
     ResourceEntryMap* entry_map,
     ChangeListToEntryMapUMAStats* uma_stats) {
diff --git a/chrome/browser/chromeos/drive/change_list_processor.h b/chrome/browser/chromeos/drive/change_list_processor.h
index 786abf9..fb8d20a 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.h
+++ b/chrome/browser/chromeos/drive/change_list_processor.h
@@ -47,45 +47,46 @@ class ChangeList {
   DISALLOW_COPY_AND_ASSIGN(ChangeList);
 };
 
-// ChangeListProcessor is used to process feeds from WAPI (codename for
-// Documents List API) or Google Drive API.
+// ChangeListProcessor is used to process change lists, or full resource
+// lists from WAPI (codename for Documents List API) or Google Drive API, and
+// updates the resource metadata stored locally.
 class ChangeListProcessor {
  public:
   typedef std::map<std::string /* resource_id */, ResourceEntry>
       ResourceEntryMap;
 
-  // Class used to record UMA stats with FeedToEntryMap().
+  // Class used to record UMA stats with ConvertToMap().
   class ChangeListToEntryMapUMAStats;
 
   explicit ChangeListProcessor(ResourceMetadata* resource_metadata);
   ~ChangeListProcessor();
 
-  // Applies the documents feeds to the file system using |resource_metadata_|.
+  // Applies change lists or full resource lists to |resource_metadata_|.
   //
-  // |is_delta_feed| determines the type of feed to process, whether it is a
-  // root feed (false) or a delta feed (true).
+  // |is_delta_update| determines the type of input data to process, whether
+  // it is full resource lists (false) or change lists (true).
   //
   // Must be run on the same task runner as |resource_metadata_| uses.
   //
   // TODO(hashimoto): Report error on failures.
-  void ApplyFeeds(scoped_ptr<google_apis::AboutResource> about_resource,
-                  ScopedVector<ChangeList> change_lists,
-                  bool is_delta_feed);
+  void Apply(scoped_ptr<google_apis::AboutResource> about_resource,
+             ScopedVector<ChangeList> change_lists,
+             bool is_delta_update);
 
   // Converts change lists into a ResourceEntryMap.
   // |uma_stats| may be NULL.
-  static void FeedToEntryMap(ScopedVector<ChangeList> change_lists,
-                             ResourceEntryMap* entry_map,
-                             ChangeListToEntryMapUMAStats* uma_stats);
+  static void ConvertToMap(ScopedVector<ChangeList> change_lists,
+                           ResourceEntryMap* entry_map,
+                           ChangeListToEntryMapUMAStats* uma_stats);
 
-  // The set of changed directories as a result of feed processing.
+  // The set of changed directories as a result of change list processing.
   const std::set<base::FilePath>& changed_dirs() const { return changed_dirs_; }
 
  private:
-  // Applies the pre-processed feed from entry_map_ onto the filesystem.
-  // If this is not delta feed update (i.e. |is_delta_feed| is false),
+  // Applies the pre-processed metadata from entry_map_ onto the resource
+  // metadata. If this is not delta update (i.e. |is_delta_update| is false),
   // |about_resource| must not be null.
-  void ApplyEntryMap(bool is_delta_feed,
+  void ApplyEntryMap(bool is_delta_update,
                      scoped_ptr<google_apis::AboutResource> about_resource);
 
   // Apply the next item from entry_map_ to the file system. The async
diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
index f56378c..b488c77 100644
--- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
@@ -87,7 +87,7 @@ class ChangeListProcessorTest : public testing::Test {
     ChangeListProcessor processor(metadata_.get());
     blocking_task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&ChangeListProcessor::ApplyFeeds,
+        base::Bind(&ChangeListProcessor::Apply,
                    base::Unretained(&processor),
                    base::Passed(&about_resource),
                    base::Passed(&changes),
@@ -103,7 +103,7 @@ class ChangeListProcessorTest : public testing::Test {
     ChangeListProcessor processor(metadata_.get());
     blocking_task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&ChangeListProcessor::ApplyFeeds,
+        base::Bind(&ChangeListProcessor::Apply,
                    base::Unretained(&processor),
                    base::Passed(&null_about_resource),
                    base::Passed(&changes),
@@ -213,7 +213,7 @@ TEST_F(ChangeListProcessorTest, DeltaFileAddedInNewDirectory) {
       "chromeos/gdata/delta_file_added_in_new_directory.json";
 
   ChangeListProcessor::ResourceEntryMap entry_map;
-  ChangeListProcessor::FeedToEntryMap(
+  ChangeListProcessor::ConvertToMap(
       ParseChangeList(kTestJson), &entry_map, NULL);
 
   const std::string kRootId("fake_root");
@@ -246,7 +246,7 @@ TEST_F(ChangeListProcessorTest, DeltaDirMovedFromRootToDirectory) {
       "chromeos/gdata/delta_dir_moved_from_root_to_directory.json";
 
   ChangeListProcessor::ResourceEntryMap entry_map;
-  ChangeListProcessor::FeedToEntryMap(
+  ChangeListProcessor::ConvertToMap(
       ParseChangeList(kTestJson), &entry_map, NULL);
 
   const std::string kMovedId("folder:1_folder_resource_id");
@@ -273,7 +273,7 @@ TEST_F(ChangeListProcessorTest, DeltaFileMovedFromDirectoryToRoot) {
       "chromeos/gdata/delta_file_moved_from_directory_to_root.json";
 
   ChangeListProcessor::ResourceEntryMap entry_map;
-  ChangeListProcessor::FeedToEntryMap(
+  ChangeListProcessor::ConvertToMap(
       ParseChangeList(kTestJson), &entry_map, NULL);
 
   const std::string kRootId("fake_root");
@@ -301,7 +301,7 @@ TEST_F(ChangeListProcessorTest, DeltaFileRenamedInDirectory) {
       "chromeos/gdata/delta_file_renamed_in_directory.json";
 
   ChangeListProcessor::ResourceEntryMap entry_map;
-  ChangeListProcessor::FeedToEntryMap(
+  ChangeListProcessor::ConvertToMap(
       ParseChangeList(kTestJson), &entry_map, NULL);
 
   const std::string kRootId("fake_root");
@@ -331,4 +331,3 @@ TEST_F(ChangeListProcessorTest, DeltaFileRenamedInDirectory) {
 
 }  // namespace internal
 }  // namespace drive
-