Remove parent* arg from GDataEntry ctor.

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 <string>
 
@@ skipping 104 matching lines @@
 };
 
 // Used to receive the result from GetEntryInfoPairCallback().
 typedef base::Callback<void(scoped_ptr<EntryInfoPairResult> pair_result)>
     GetEntryInfoPairCallback;
 
 // Base class for representing files and directories in gdata virtual file
 // 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;
 
   // Converts the proto representation to the platform file.
   static void ConvertProtoToPlatformFileInfo(
       const PlatformFileInfoProto& proto,
       base::PlatformFileInfo* file_info);
 
   // Converts the platform file info to the proto representation.
   static void ConvertPlatformFileInfoToProto(
@@ skipping 62 matching lines @@
   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 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);
 
   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.
@@ skipping 24 matching lines @@
 };
 
 typedef std::map<FilePath::StringType, GDataFile*> GDataFileCollection;
 typedef std::map<FilePath::StringType, GDataDirectory*>
     GDataDirectoryCollection;
 
 // 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:
-  // 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;
 
   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 GDataEntry::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.
+
+  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_;
   std::string content_mime_type_;
   std::string file_md5_;
   std::string document_extension_;
   bool is_hosted_document_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataFile);
 };
 
 // Represents "directory" in a GData virtual file system. Maps to gdata
 // 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;
 
   // Converts the children as a vector of GDataEntryProto.
   scoped_ptr<GDataEntryProtoVector> ToProtoVector() const;
 
   // Collection of children files/directories.
   const GDataFileCollection& child_files() const { return child_files_; }
   const GDataDirectoryCollection& child_directories() const {
     return child_directories_;
   }
 
  private:
   // TODO(satorux): Remove the friend statements. crbug.com/139649
   friend class GDataDirectoryService;
   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
   // the same name "Foo" will be renames to "Foo (1)" and "Foo (2)".
   // TODO(satorux): Remove this. crbug.com/139649
   void AddEntry(GDataEntry* entry);
 
   // Removes the entry from its children list and destroys the entry instance.
   // TODO(satorux): Remove this. crbug.com/139649
   void RemoveEntry(GDataEntry* entry);
@@ skipping 50 matching lines @@
 
   // Largest change timestamp that was the source of content for the current
   // state of the root directory.
   const int64 largest_changestamp() const { return largest_changestamp_; }
   void set_largest_changestamp(int64 value) { largest_changestamp_ = value; }
 
   // The root directory content origin.
   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);
 
   // Move |entry| to |directory_path| asynchronously. Removes entry from
   // previous parent. Must be called on UI thread. |callback| is called on the
   // UI thread.
   void MoveEntryToDirectory(const FilePath& directory_path,
                             GDataEntry* entry,
                             const FileMoveCallback& callback);
 
@@ skipping 110 matching lines @@
   // This should remain the last member so it'll be destroyed first and
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<GDataDirectoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectoryService);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILES_H_