Simplify implementation of FindEntryByPathSync

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 268 matching lines @@
 
   // Converts to/from proto.
   bool FromProto(const GDataDirectoryProto& proto) WARN_UNUSED_RESULT;
   void ToProto(GDataDirectoryProto* proto) const;
 
   // Removes child elements.
   void RemoveChildren();
   void RemoveChildFiles();
   void RemoveChildDirectories();
 
+  // Find child by its name.
+  void FindChildAsync(const FilePath::StringType& file_name,

[satorux1, 2012/08/07 10:43:46]

base_name ?

+                      const FindEntryCallback& callback) 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;
 
   // 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
-  bool RemoveEntry(GDataEntry* entry);
+  void RemoveEntry(GDataEntry* entry);
 
   // Takes the ownership of |entry| from its current parent. If this directory
   // is already the current parent of |file|, this method effectively goes
   // through the name de-duplication for |file| based on the current state of
   // the file system.
   // TODO(satorux): Remove this. crbug.com/139649
   bool TakeEntry(GDataEntry* entry);
 
   // Takes over all entries from |dir|.
   // TODO(satorux): Remove this. crbug.com/139649
   bool TakeOverEntries(GDataDirectory* dir);
 
   // Find a child by its name.
   // TODO(satorux): Remove this. crbug.com/139649
   GDataEntry* FindChild(const FilePath::StringType& file_name) const;
 
   // Add |entry| to children.
   void AddChild(GDataEntry* entry);
 
   // Removes the entry from its children without destroying the
   // entry instance.
-  bool RemoveChild(GDataEntry* entry);
+  void RemoveChild(GDataEntry* entry);
 
   // Collection of children GDataEntry items.
   GDataFileCollection child_files_;
   GDataDirectoryCollection child_directories_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectory);
 };
 
 // TODO(achuith,hashimoto,satorux): Move this to a separate file.
 // crbug.com/140317.
 // Class to handle GDataEntry* lookups, add/remove GDataEntry*.
 class GDataDirectoryService {
  public:
   // Callback for GetEntryByResourceIdAsync.
   typedef base::Callback<void(GDataEntry* entry)> GetEntryByResourceIdCallback;
-
   // Map of resource id and serialized GDataEntry.
   typedef std::map<std::string, std::string> SerializedMap;
 
   GDataDirectoryService();
   ~GDataDirectoryService();
 
   GDataDirectory* root() { return root_.get(); }
 
   // Last time when we dumped serialized file system to disk.
   const base::Time& last_serialized() const { return last_serialized_; }
@@ skipping 91 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_