ResourceId and unit test cleanup.

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 {
@@ skipping 37 matching lines @@
       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|).
   bool FromProto(const GDataEntryProto& proto) WARN_UNUSED_RESULT;
+  // TODO(achuith,satorux): Should this be virtual?
   void ToProto(GDataEntryProto* 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;
 
   // Escapes forward slashes from file names with magic unicode character
   // \u2215 pretty much looks the same in UI.
@@ skipping 84 matching lines @@
 
   GDataDirectory* parent_;
   // Weak pointer to GDataDirectoryService.
   GDataDirectoryService* directory_service_;
   bool deleted_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GDataEntry);
 };
 
-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:
   virtual ~GDataFile();
 
   // Converts to/from proto.
   bool FromProto(const GDataEntryProto& proto) WARN_UNUSED_RESULT;
   void ToProto(GDataEntryProto* proto) const;
 
@@ skipping 38 matching lines @@
  public:
   virtual ~GDataDirectory();
 
   // 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_;
-  }

[satorux1, 2012/08/17 11:49:17]

glad to see them gone.

-
  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 23 matching lines @@
 
   // Removes the entry from its children without destroying the
   // entry instance.
   void RemoveChild(GDataEntry* entry);
 
   // Removes child elements.
   void RemoveChildren();
   void RemoveChildFiles();
   void RemoveChildDirectories();
 
-  // Collection of children GDataEntry items.
+  // Recursively extracts the paths set of all sub-directories.
+  void GetChildDirectoryPaths(std::set<FilePath>* child_dirs);
+
+  // Maps between base_name and resource_id of files and directories.
+  typedef std::map<FilePath::StringType, GDataFile*> GDataFileCollection;
+  typedef std::map<FilePath::StringType, GDataDirectory*>
+      GDataDirectoryCollection;
+  // Collection of children.
   GDataFileCollection child_files_;
   GDataDirectoryCollection child_directories_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectory);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILES_H_