Rename GDataDirectoryService to DriveResourceMetadata

chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc

Index: chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc b/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc
index 4a0d0d2e9eb65defa2c9fb48f066469a2326c94b..4d8ba8e1f2f253909aece5d866d2f031cb487884 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc
+++ b/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc
@@ -5,8 +5,8 @@
 #include <utility>
 
 #include "base/metrics/histogram.h"
+#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
 #include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/gdata_directory_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -23,8 +23,8 @@ FeedToFileResourceMapUmaStats::~FeedToFileResourceMapUmaStats() {
 }
 
 GDataWapiFeedProcessor::GDataWapiFeedProcessor(
-    GDataDirectoryService* directory_service)
-  : directory_service_(directory_service) {
+    DriveResourceMetadata* resource_metadata)
+  : resource_metadata_(resource_metadata) {
 }
 
 GDataWapiFeedProcessor::~GDataWapiFeedProcessor() {
@@ -37,7 +37,7 @@ GDataFileError GDataWapiFeedProcessor::ApplyFeeds(
     std::set<FilePath>* changed_dirs) {
   bool is_delta_feed = start_changestamp != 0;
 
-  directory_service_->set_origin(FROM_SERVER);
+  resource_metadata_->set_origin(FROM_SERVER);
 
   int64 delta_feed_changestamp = 0;
   FeedToFileResourceMapUmaStats uma_stats;
@@ -94,13 +94,13 @@ void GDataWapiFeedProcessor::ApplyFeedFromFileUrlMap(
   DCHECK(changed_dirs);
 
   if (!is_delta_feed) {  // Full update.
-    directory_service_->root()->RemoveChildren();
-    changed_dirs->insert(directory_service_->root()->GetFilePath());
+    resource_metadata_->root()->RemoveChildren();
+    changed_dirs->insert(resource_metadata_->root()->GetFilePath());
   }
-  directory_service_->set_largest_changestamp(feed_changestamp);
+  resource_metadata_->set_largest_changestamp(feed_changestamp);
 
-  scoped_ptr<GDataDirectoryService> orphaned_dir_service(
-      new GDataDirectoryService);
+  scoped_ptr<DriveResourceMetadata> orphaned_resources(
+      new DriveResourceMetadata);
   // Go through all entries generated by the feed and apply them to the local
   // snapshot of the file system.
   for (FileResourceIdMap::iterator it = file_map->begin();
@@ -113,7 +113,7 @@ void GDataWapiFeedProcessor::ApplyFeedFromFileUrlMap(
     file_map->erase(it++);
 
     DriveEntry* old_entry =
-        directory_service_->GetEntryByResourceId(entry->resource_id());
+        resource_metadata_->GetEntryByResourceId(entry->resource_id());
     DriveDirectory* dest_dir = NULL;
     if (entry->is_deleted()) {  // Deleted file/directory.
       DVLOG(1) << "Removing file " << entry->base_name();
@@ -149,31 +149,31 @@ void GDataWapiFeedProcessor::ApplyFeedFromFileUrlMap(
         changed_dirs->insert(dest_dir->GetFilePath());
         dest_dir = FindDirectoryForNewEntry(entry.get(),
                                             *file_map,
-                                            orphaned_dir_service.get());
+                                            orphaned_resources.get());
       }
       DCHECK(dest_dir);
       AddEntryToDirectoryAndCollectChangedDirectories(
           entry.release(),
           dest_dir,
-          orphaned_dir_service.get(),
+          orphaned_resources.get(),
           changed_dirs);
     } else {  // Adding a new file.
       dest_dir = FindDirectoryForNewEntry(entry.get(),
                                           *file_map,
-                                          orphaned_dir_service.get());
+                                          orphaned_resources.get());
       DCHECK(dest_dir);
       AddEntryToDirectoryAndCollectChangedDirectories(
           entry.release(),
           dest_dir,
-          orphaned_dir_service.get(),
+          orphaned_resources.get(),
           changed_dirs);
     }
 
     // Record changed directory if this was a delta feed and the parent
     // directory is already properly rooted within its parent.
     if (dest_dir && (dest_dir->parent() ||
-        dest_dir == directory_service_->root()) &&
-        dest_dir != orphaned_dir_service->root() && is_delta_feed) {
+        dest_dir == resource_metadata_->root()) &&
+        dest_dir != orphaned_resources->root() && is_delta_feed) {
       changed_dirs->insert(dest_dir->GetFilePath());
     }
   }
@@ -185,10 +185,10 @@ void GDataWapiFeedProcessor::ApplyFeedFromFileUrlMap(
 void GDataWapiFeedProcessor::AddEntryToDirectoryAndCollectChangedDirectories(
     DriveEntry* entry,
     DriveDirectory* directory,
-    GDataDirectoryService* orphaned_dir_service,
+    DriveResourceMetadata* orphaned_resources,
     std::set<FilePath>* changed_dirs) {
   directory->AddEntry(entry);
-  if (entry->AsDriveDirectory() && directory != orphaned_dir_service->root())
+  if (entry->AsDriveDirectory() && directory != orphaned_resources->root())
     changed_dirs->insert(entry->GetFilePath());
 }
 
@@ -209,16 +209,16 @@ RemoveEntryFromDirectoryAndCollectChangedDirectories(
 DriveDirectory* GDataWapiFeedProcessor::FindDirectoryForNewEntry(
     DriveEntry* new_entry,
     const FileResourceIdMap& file_map,
-    GDataDirectoryService* orphaned_dir_service) {
+    DriveResourceMetadata* orphaned_resources) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DriveDirectory* dir = NULL;
   // Added file.
   const std::string& parent_id = new_entry->parent_resource_id();
   if (parent_id.empty()) {
-    dir = directory_service_->root();
+    dir = resource_metadata_->root();
     DVLOG(1) << "Root parent for " << new_entry->base_name();
   } else {
-    DriveEntry* entry = directory_service_->GetEntryByResourceId(parent_id);
+    DriveEntry* entry = resource_metadata_->GetEntryByResourceId(parent_id);
     dir = entry ? entry->AsDriveDirectory() : NULL;
     if (!dir) {
       // The parent directory was also added with this set of feeds.
@@ -232,7 +232,7 @@ DriveDirectory* GDataWapiFeedProcessor::FindDirectoryForNewEntry(
                  << " in file_map " << parent_id;
       } else {
         DVLOG(1) << "Adding orphan " << new_entry->GetFilePath().value();
-        dir = orphaned_dir_service->root();
+        dir = orphaned_resources->root();
       }
     }
   }
@@ -260,7 +260,7 @@ GDataFileError GDataWapiFeedProcessor::FeedToFileResourceMap(
       const Link* root_feed_upload_link =
           feed->GetLinkByType(Link::RESUMABLE_CREATE_MEDIA);
       if (root_feed_upload_link)
-        directory_service_->root()->set_upload_url(
+        resource_metadata_->root()->set_upload_url(
             root_feed_upload_link->href());
       *feed_changestamp = feed->largest_changestamp();
       DCHECK_GE(*feed_changestamp, 0);
@@ -270,7 +270,7 @@ GDataFileError GDataWapiFeedProcessor::FeedToFileResourceMap(
              feed->entries().begin();
          iter != feed->entries().end(); ++iter) {
       DocumentEntry* doc = *iter;
-      DriveEntry* entry = directory_service_->FromDocumentEntry(*doc);
+      DriveEntry* entry = resource_metadata_->FromDocumentEntry(*doc);
       // Some document entries don't map into files (i.e. sites).
       if (!entry)
         continue;