chromeos: Remove DriveResourceMetadata::RemoveDirectoryChildFiles/Directories

chrome/browser/chromeos/drive/drive_resource_metadata.cc

 // 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.
 
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 
 #include <leveldb/db.h>
 #include <stack>
 #include <utility>
 
@@ skipping 726 matching lines @@
   RemoveEntryFromResourceMap(entry->resource_id());
 
   // Then delete it from tree.
   child_maps_[directory->resource_id()].erase(base_name);
 
   entry->set_parent_resource_id(std::string());
 }
 
 void DriveResourceMetadata::RemoveDirectoryChildren(
     DriveEntryProto* directory) {
-  RemoveDirectoryChildFiles(directory);
-  RemoveDirectoryChildDirectories(directory);
-  DCHECK(child_maps_[directory->resource_id()].empty());
-  child_maps_.erase(directory->resource_id());
-}
-
-void DriveResourceMetadata::RemoveDirectoryChildFiles(
-    DriveEntryProto* directory) {
   DCHECK(directory->file_info().is_directory());
   DriveResourceMetadata::ChildMap* children =
       &child_maps_[directory->resource_id()];
-  for (DriveResourceMetadata::ChildMap::iterator iter = children->begin(),
-           iter_next = iter; iter != children->end(); iter = iter_next) {
-    ++iter_next;
+  for (DriveResourceMetadata::ChildMap::iterator iter = children->begin();
+       iter != children->end(); ++iter) {
     DriveEntryProto* child = GetEntryByResourceId(iter->second);
     DCHECK(child);
-    if (!child->file_info().is_directory()) {
-      RemoveEntryFromResourceMap(iter->second);
-      delete child;
-      children->erase(iter);
-    }
+    // Remove directories recursively.
+    if (child->file_info().is_directory())
+      RemoveDirectoryChildren(child);
+
+    RemoveEntryFromResourceMap(iter->second);
+    delete child;
   }
-}
-
-void DriveResourceMetadata::RemoveDirectoryChildDirectories(
-    DriveEntryProto* directory) {
-  DCHECK(directory->file_info().is_directory());
-  DriveResourceMetadata::ChildMap* children =
-      &child_maps_[directory->resource_id()];
-  for (DriveResourceMetadata::ChildMap::iterator iter = children->begin(),
-           iter_next = iter; iter != children->end(); iter = iter_next) {
-    ++iter_next;
-    DriveEntryProto* entry = GetEntryByResourceId(iter->second);
-    DCHECK(entry);
-    if (entry->file_info().is_directory()) {
-      // Remove directories recursively.
-      RemoveDirectoryChildren(entry);
-      RemoveEntryFromResourceMap(iter->second);
-      delete entry;
-      children->erase(iter);
-    }
-  }
+  child_maps_.erase(directory->resource_id());
 }
 
 void DriveResourceMetadata::ProtoToDirectory(const DriveDirectoryProto& proto,
                                              DriveEntryProto* directory) {
   DCHECK(proto.drive_entry().file_info().is_directory());
   DCHECK(!proto.drive_entry().has_file_specific_info());
 
   *directory = CreateEntryWithProperBaseName(proto.drive_entry());
 
   for (int i = 0; i < proto.child_files_size(); ++i) {
@@ skipping 33 matching lines @@
   const ChildMap& children = child_maps_[directory->resource_id()];
   for (ChildMap::const_iterator iter = children.begin();
        iter != children.end(); ++iter) {
     const DriveEntryProto& proto = *GetEntryByResourceId(iter->second);
     entries->push_back(proto);
   }
   return entries.Pass();
 }
 
 }  // namespace drive