Remove parent* arg from GDataEntry ctor.

chrome/browser/chromeos/gdata/gdata_files.h

Index: chrome/browser/chromeos/gdata/gdata_files.h
===================================================================
--- chrome/browser/chromeos/gdata/gdata_files.h	(revision 151007)
+++ chrome/browser/chromeos/gdata/gdata_files.h	(working copy)
@@ -122,23 +122,18 @@
 // system.
 class GDataEntry {
  public:
-  // TODO(achuith): Remove |parent| from ctor. crbug.com/141494
-  GDataEntry(GDataDirectory* parent, GDataDirectoryService* directory_service);
   virtual ~GDataEntry();
 
   virtual GDataFile* AsGDataFile();
   virtual GDataDirectory* AsGDataDirectory();
 
+  // Initializes from DocumentEntry.
+  virtual void InitFromDocumentEntry(DocumentEntry* doc);
+
   // const versions of AsGDataFile and AsGDataDirectory.
   const GDataFile* AsGDataFileConst() const;
   const GDataDirectory* AsGDataDirectoryConst() const;
 
-  // Converts DocumentEntry into GDataEntry.
-  static GDataEntry* FromDocumentEntry(
-      GDataDirectory* parent,
-      DocumentEntry* doc,
-      GDataDirectoryService* directory_service);
-
   // Serialize/Parse to/from string via proto classes.
   void SerializeToString(std::string* serialized_proto) const;
 
@@ -221,6 +216,8 @@
   // For access to SetParent from AddEntry.
   friend class GDataDirectory;
 
+  explicit GDataEntry(GDataDirectoryService* directory_service);
+
   // Sets the parent directory of this file system entry.
   // It is intended to be used by GDataDirectory::AddEntry() only.
   void SetParent(GDataDirectory* parent);
@@ -265,18 +262,8 @@
 // this could be either a regular file or a server side document.
 class GDataFile : public GDataEntry {
  public:
-  // TODO(achuith): Remove |parent| from ctor. crbug.com/141494
-  explicit GDataFile(GDataDirectory* parent,
-                     GDataDirectoryService* directory_service);
   virtual ~GDataFile();
-  virtual GDataFile* AsGDataFile() OVERRIDE;
 
-  // Converts DocumentEntry into GDataEntry.
-  static GDataEntry* FromDocumentEntry(
-      GDataDirectory* parent,
-      DocumentEntry* doc,
-      GDataDirectoryService* directory_service);
-
   // Converts to/from proto.
   bool FromProto(const GDataEntryProto& proto) WARN_UNUSED_RESULT;
   void ToProto(GDataEntryProto* proto) const;
@@ -297,6 +284,14 @@
   virtual void SetBaseNameFromTitle() OVERRIDE;
 
  private:
+  friend class GDataDirectoryService;  // For access to ctor.
+
+  explicit GDataFile(GDataDirectoryService* directory_service);
+  // Initializes from DocumentEntry.
+  virtual void InitFromDocumentEntry(DocumentEntry* doc) OVERRIDE;
+
+  virtual GDataFile* AsGDataFile() OVERRIDE;
+
   DocumentEntry::EntryKind kind_;  // Not saved in proto.
   GURL thumbnail_url_;
   GURL alternate_url_;
@@ -312,18 +307,8 @@
 // collection element.
 class GDataDirectory : public GDataEntry {
  public:
-  // TODO(achuith): Remove |parent| from ctor. crbug.com/141494
-  GDataDirectory(GDataDirectory* parent,
-                 GDataDirectoryService* directory_service);
   virtual ~GDataDirectory();
-  virtual GDataDirectory* AsGDataDirectory() OVERRIDE;
 
-  // Converts DocumentEntry into GDataEntry.
-  static GDataEntry* FromDocumentEntry(
-      GDataDirectory* parent,
-      DocumentEntry* doc,
-      GDataDirectoryService* directory_service);
-
   // Converts to/from proto.
   bool FromProto(const GDataDirectoryProto& proto) WARN_UNUSED_RESULT;
   void ToProto(GDataDirectoryProto* proto) const;
@@ -343,6 +328,13 @@
   friend class GDataFileSystem;
   friend class GDataWapiFeedProcessor;
 
+  explicit GDataDirectory(GDataDirectoryService* directory_service);
+
+  // Initializes from DocumentEntry.
+  virtual void InitFromDocumentEntry(DocumentEntry* doc) OVERRIDE;
+
+  virtual GDataDirectory* AsGDataDirectory() 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
@@ -413,6 +405,15 @@
   const ContentOrigin origin() const { return origin_; }
   void set_origin(ContentOrigin value) { origin_ = value; }
 
+  // Creates a GDataEntry from a DocumentEntry.
+  GDataEntry* FromDocumentEntry(DocumentEntry* doc);
+
+  // Creates a GDataFile instance.
+  GDataFile* CreateGDataFile();
+
+  // Creates a GDataDirectory instance.
+  GDataDirectory* CreateGDataDirectory();
+
   // Sets root directory resource id and initialize the root entry.
   void InitializeRootEntry(const std::string& root_id);