Rename GDataDirectoryService to DriveResourceMetadata

chrome/browser/chromeos/gdata/drive_files.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_GDATA_DRIVE_FILES_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILES_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
 
 namespace gdata {
 
 class DriveDirectory;
 class DriveDirectoryProto;
 class DriveEntryProto;
 class DriveFile;
-class GDataDirectoryService;
+class DriveResourceMetadata;
 class PlatformFileInfoProto;
 
 // Used to read a directory from the file system.
 // If |error| is not GDATA_FILE_OK, |entries| is set to NULL.
 // |entries| are contents, both files and directories, of the directory.
 typedef std::vector<DriveEntryProto> DriveEntryProtoVector;
 
 // Base class for representing files and directories in Drive virtual file
 // system.
 class DriveEntry {
@@ skipping 66 matching lines @@
 
   // Upload URL is used for uploading files. See drive.proto for details.
   const GURL& upload_url() const { return upload_url_; }
   void set_upload_url(const GURL& url) { upload_url_ = url; }
 
   // The edit URL is used for removing files and hosted documents.
   const GURL& edit_url() const { return edit_url_; }
 
   // 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
   // delta feeds.
   bool is_deleted() const { return deleted_; }
 
   // Returns virtual file path representing this file system entry. This path
   // corresponds to file path expected by public methods of GDataFileSystem
   // class.
   FilePath GetFilePath() const;
 
   // Sets |base_name_| based on the value of |title_| without name
   // de-duplication (see AddEntry() for details on de-duplication).
   virtual void SetBaseNameFromTitle();
 
  protected:
   // 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.
   void SetParent(DriveDirectory* parent);
 
   base::PlatformFileInfo file_info_;
   // Title of this file (i.e. the 'title' attribute associated with a regular
   // file, hosted document, or collection). The title is used to derive
   // |base_name_| but may be different from |base_name_|. For example,
   // |base_name_| has an added .g<something> extension for hosted documents or
   // may have an extra suffix for name de-duplication on the gdata file system.

[achuithb, 2012/08/22 09:41:06]

drive file system

[kochi, 2012/08/22 10:04:56]

Done.

   FilePath::StringType title_;
   std::string resource_id_;
   std::string parent_resource_id_;
   // Files with the same title will be uniquely identified with this field
   // so we can represent them with unique URLs/paths in File API layer.
   // For example, two files in the same directory with the same name "Foo"
   // will show up in the virtual directory as "Foo" and "Foo (2)".
   GURL edit_url_;
   GURL content_url_;
   GURL upload_url_;
 
   // Remaining fields are not serialized.
 
   // Name of this file in the gdata virtual file system. This can change

[achuithb, 2012/08/22 09:41:06]

drive file system

[kochi, 2012/08/22 10:04:56]

Done.

   // due to de-duplication (See AddEntry).
   FilePath::StringType base_name_;
 
   DriveDirectory* parent_;
-  // Weak pointer to GDataDirectoryService.
-  GDataDirectoryService* directory_service_;
+  // Weak pointer to DriveResourceMetadata.
+  DriveResourceMetadata* resource_metadata_;
   bool deleted_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriveEntry);
 };
 
 // Represents "file" in in a GData virtual file system. On gdata feed side,

[achuithb, 2012/08/22 09:41:06]

drive file system.

[kochi, 2012/08/22 10:04:56]

Done.

 // this could be either a regular file or a server side document.
 class DriveFile : public DriveEntry {
  public:
   virtual ~DriveFile();
 
   // Converts to/from proto.
   void FromProto(const DriveEntryProto& proto);
   void ToProto(DriveEntryProto* proto) const;
 
   DocumentEntry::EntryKind kind() const { return kind_; }
   const GURL& thumbnail_url() const { return thumbnail_url_; }
   const GURL& alternate_url() const { return alternate_url_; }
   const std::string& content_mime_type() const { return content_mime_type_; }
   const std::string& file_md5() const { return file_md5_; }
   void set_file_md5(const std::string& file_md5) { file_md5_ = file_md5; }
   const std::string& document_extension() const { return document_extension_; }
   bool is_hosted_document() const { return is_hosted_document_; }
   void set_file_info(const base::PlatformFileInfo& info) { file_info_ = info; }
 
   // Overrides DriveEntry::SetBaseNameFromTitle() to set |base_name_| based
   // on the value of |title_| as well as |is_hosted_document_| and
   // |document_extension_| for hosted documents.
   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;
 
   virtual DriveFile* AsDriveFile() OVERRIDE;
 
   DocumentEntry::EntryKind kind_;  // Not saved in proto.
   GURL thumbnail_url_;
   GURL alternate_url_;
   std::string content_mime_type_;
   std::string file_md5_;
   std::string document_extension_;
   bool is_hosted_document_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFile);
 };
 
 // Represents "directory" in a GData virtual file system. Maps to gdata

[achuithb, 2012/08/22 09:41:06]

drive file system. drive collection element.

[kochi, 2012/08/22 10:04:56]

Done.

 // collection element.
 class DriveDirectory : public DriveEntry {
  public:
   virtual ~DriveDirectory();
 
   // Converts to/from proto.
   void FromProto(const DriveDirectoryProto& proto);
   void ToProto(DriveDirectoryProto* proto) const;
 
   // Converts the children as a vector of DriveEntryProto.
   scoped_ptr<DriveEntryProtoVector> ToProtoVector() const;
 
  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;
 
   virtual DriveDirectory* AsDriveDirectory() OVERRIDE;
 
   // Adds child file to the directory and takes over the ownership of |file|
   // object. The method will also do name de-duplication to ensure that the
   // exposed presentation path does not have naming conflicts. Two files with
   // the same name "Foo" will be renames to "Foo (1)" and "Foo (2)".
@@ skipping 22 matching lines @@
 
   // Removes child elements.
   void RemoveChildren();
   void RemoveChildFiles();
   void RemoveChildDirectories();
 
   // Recursively extracts the paths set of all sub-directories.
   void GetChildDirectoryPaths(std::set<FilePath>* child_dirs);
 
   // Map between base_name and resource_id of files and directories.
   typedef std::map<FilePath::StringType, std::string> GDataChildMap;

[achuithb, 2012/08/22 09:41:06]

Could you rename this to ChildMap?

[kochi, 2012/08/22 10:04:56]

Done.

   // Collection of children.
   GDataChildMap child_files_;
   GDataChildMap child_directories_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveDirectory);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILES_H_