Rename GDataDirectoryService to DriveResourceMetadata

chrome/browser/chromeos/gdata/drive_files.h

Index: chrome/browser/chromeos/gdata/drive_files.h
diff --git a/chrome/browser/chromeos/gdata/drive_files.h b/chrome/browser/chromeos/gdata/drive_files.h
index e9b88154b17ad426c297c06ae41ec5beb8e8a969..eab0539de02de161921be551ba1a25ea00a55a05 100644
--- a/chrome/browser/chromeos/gdata/drive_files.h
+++ b/chrome/browser/chromeos/gdata/drive_files.h
@@ -22,7 +22,7 @@ class DriveDirectory;
 class DriveDirectoryProto;
 class DriveEntryProto;
 class DriveFile;
-class GDataDirectoryService;
+class DriveResourceMetadata;
 class PlatformFileInfoProto;
 
 // Used to read a directory from the file system.
@@ -109,7 +109,7 @@ class DriveEntry {
 
   // The resource id of the parent folder. This piece of information is needed
   // to pair files from change feeds with their directory parents withing the
-  // existing file system snapshot (GDataDirectoryService::resource_map_).
+  // existing file system snapshot (DriveResourceMetadata::resource_map_).
   const std::string& parent_resource_id() const { return parent_resource_id_; }
 
   // True if file was deleted. Used only for instances that are generated from
@@ -129,7 +129,7 @@ class DriveEntry {
   // For access to SetParent from AddEntry.
   friend class DriveDirectory;
 
-  explicit DriveEntry(GDataDirectoryService* directory_service);
+  explicit DriveEntry(DriveResourceMetadata* resource_metadata);
 
   // Sets the parent directory of this file system entry.
   // It is intended to be used by DriveDirectory::AddEntry() only.
@@ -159,8 +159,8 @@ class DriveEntry {
   FilePath::StringType base_name_;
 
   DriveDirectory* parent_;
-  // Weak pointer to GDataDirectoryService.
-  GDataDirectoryService* directory_service_;
+  // Weak pointer to DriveResourceMetadata.
+  DriveResourceMetadata* resource_metadata_;
   bool deleted_;
 
  private:
@@ -193,9 +193,9 @@ class DriveFile : public DriveEntry {
   virtual void SetBaseNameFromTitle() OVERRIDE;
 
  private:
-  friend class GDataDirectoryService;  // For access to ctor.
+  friend class DriveResourceMetadata;  // For access to ctor.
 
-  explicit DriveFile(GDataDirectoryService* directory_service);
+  explicit DriveFile(DriveResourceMetadata* resource_metadata);
   // Initializes from DocumentEntry.
   virtual void InitFromDocumentEntry(const DocumentEntry& doc) OVERRIDE;
 
@@ -227,10 +227,10 @@ class DriveDirectory : public DriveEntry {
 
  private:
   // TODO(satorux): Remove the friend statements. crbug.com/139649
-  friend class GDataDirectoryService;
+  friend class DriveResourceMetadata;
   friend class GDataWapiFeedProcessor;
 
-  explicit DriveDirectory(GDataDirectoryService* directory_service);
+  explicit DriveDirectory(DriveResourceMetadata* resource_metadata);
 
   // Initializes from DocumentEntry.
   virtual void InitFromDocumentEntry(const DocumentEntry& doc) OVERRIDE;