Rename GData* to Drive* in gdata.proto

chrome/browser/chromeos/gdata/gdata_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_GDATA_FILES_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_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 GDataFile;
+class DriveDirectoryProto;
+class DriveEntryProto;
 class GDataDirectory;
 class GDataDirectoryService;
-
-class GDataEntryProto;
-class GDataDirectoryProto;
-class GDataRootDirectoryProto;
+class GDataFile;
 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<GDataEntryProto> GDataEntryProtoVector;
+typedef std::vector<DriveEntryProto> DriveEntryProtoVector;
 
 // Base class for representing files and directories in gdata virtual file
 // system.
 class GDataEntry {
  public:
   virtual ~GDataEntry();
 
   virtual GDataFile* AsGDataFile();
   virtual GDataDirectory* AsGDataDirectory();
 
@@ skipping 12 matching lines @@
       const PlatformFileInfoProto& proto,
       base::PlatformFileInfo* file_info);
 
   // Converts the platform file info to the proto representation.
   static void ConvertPlatformFileInfoToProto(
       const base::PlatformFileInfo& file_info,
       PlatformFileInfoProto* proto);
 
   // Converts to/from proto. Only handles the common part (i.e. does not
   // touch |file_specific_info|).
-  void FromProto(const GDataEntryProto& proto);
+  void FromProto(const DriveEntryProto& proto);
   // TODO(achuith,satorux): Should this be virtual?
-  void ToProto(GDataEntryProto* proto) const;
+  void ToProto(DriveEntryProto* proto) const;
 
   // Similar to ToProto() but this fills in |file_specific_info| and
   // |directory_specific_info| based on the actual type of the entry.
   // Used to obtain full metadata of a file or a directory as
-  // GDataEntryProto.
-  void ToProtoFull(GDataEntryProto* proto) const;
+  // DriveEntryProto.
+  void ToProtoFull(DriveEntryProto* proto) const;
 
   // Escapes forward slashes from file names with magic unicode character
   // \u2215 pretty much looks the same in UI.
   static std::string EscapeUtf8FileName(const std::string& input);
 
   // Unescapes what was escaped in EScapeUtf8FileName.
   static std::string UnescapeUtf8FileName(const std::string& input);
 
   // Return the parent of this entry. NULL for root.
   GDataDirectory* parent() const { return parent_; }
@@ skipping 10 matching lines @@
   void set_title(const FilePath::StringType& title) { title_ = title; }
 
   // The unique resource ID associated with this file system entry.
   const std::string& resource_id() const { return resource_id_; }
   void set_resource_id(const std::string& res_id) { resource_id_ = res_id; }
 
   // The content URL is used for downloading regular files as is.
   const GURL& content_url() const { return content_url_; }
   void set_content_url(const GURL& url) { content_url_ = url; }
 
-  // Upload URL is used for uploading files. See gdata.proto for details.
+  // 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_).
   const std::string& parent_resource_id() const { return parent_resource_id_; }
@@ skipping 53 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(GDataEntry);
 };
 
 // Represents "file" in in a GData virtual file system. On gdata feed side,
 // this could be either a regular file or a server side document.
 class GDataFile : public GDataEntry {
  public:
   virtual ~GDataFile();
 
   // Converts to/from proto.
-  void FromProto(const GDataEntryProto& proto);
-  void ToProto(GDataEntryProto* proto) const;
+  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; }
@@ skipping 23 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(GDataFile);
 };
 
 // Represents "directory" in a GData virtual file system. Maps to gdata
 // collection element.
 class GDataDirectory : public GDataEntry {
  public:
   virtual ~GDataDirectory();
 
   // Converts to/from proto.
-  void FromProto(const GDataDirectoryProto& proto);
-  void ToProto(GDataDirectoryProto* proto) const;
+  void FromProto(const DriveDirectoryProto& proto);
+  void ToProto(DriveDirectoryProto* proto) const;
 
-  // Converts the children as a vector of GDataEntryProto.
-  scoped_ptr<GDataEntryProtoVector> ToProtoVector() 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 GDataWapiFeedProcessor;
 
   explicit GDataDirectory(GDataDirectoryService* directory_service);
 
   // Initializes from DocumentEntry.
   virtual void InitFromDocumentEntry(const DocumentEntry& doc) OVERRIDE;
@@ skipping 40 matching lines @@
   // Collection of children.
   GDataChildMap child_files_;
   GDataChildMap child_directories_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectory);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILES_H_