Index: chrome/browser/chromeos/gdata/gdata_files.cc |
diff --git a/chrome/browser/chromeos/gdata/gdata_files.cc b/chrome/browser/chromeos/gdata/gdata_files.cc |
index 7d9f41ea69bccd925d404f0d1de3acbb67e4318b..47d6435d90f89d38ef2a5c33690c74633dd701fb 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_files.cc |
+++ b/chrome/browser/chromeos/gdata/gdata_files.cc |
@@ -384,7 +384,11 @@ bool GDataDirectory::RemoveChild(GDataEntry* entry) { |
} |
void GDataDirectory::RemoveChildren() { |
- // Remove child files first. |
+ RemoveChildFiles(); |
+ RemoveChildDirectories(); |
+} |
+ |
+void GDataDirectory::RemoveChildFiles() { |
for (GDataFileCollection::const_iterator iter = child_files_.begin(); |
iter != child_files_.end(); ++iter) { |
if (root_) |
@@ -392,7 +396,9 @@ void GDataDirectory::RemoveChildren() { |
} |
STLDeleteValues(&child_files_); |
child_files_.clear(); |
+} |
+void GDataDirectory::RemoveChildDirectories() { |
for (GDataDirectoryCollection::iterator iter = child_directories_.begin(); |
iter != child_directories_.end(); ++iter) { |
GDataDirectory* dir = iter->second; |