chromeos: Stop removing the entry from the storage of DriveResourceMetadata when unnecessary

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 "base/file_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 1015 matching lines @@
   storage_->PutEntry(updated_entry);
 }
 
 void DriveResourceMetadata::RemoveDirectoryChild(
     const std::string& child_resource_id) {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
 
   scoped_ptr<DriveEntryProto> entry = storage_->GetEntry(child_resource_id);
   DCHECK(entry);
   DetachEntryFromDirectory(child_resource_id);
+  storage_->RemoveEntry(entry->resource_id());
   if (entry->file_info().is_directory())
     RemoveDirectoryChildren(child_resource_id);
 }
 
 void DriveResourceMetadata::DetachEntryFromDirectory(
     const std::string& child_resource_id) {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
 
   scoped_ptr<DriveEntryProto> entry = storage_->GetEntry(child_resource_id);
   DCHECK(entry);
 
   // entry must be present in this directory.
   DCHECK_EQ(entry->resource_id(),
             storage_->GetChild(entry->parent_resource_id(),
                                entry->base_name()));
-  // Remove entry from resource map first.
-  storage_->RemoveEntry(entry->resource_id());
 
-  // Then delete it from tree.
   storage_->RemoveChild(entry->parent_resource_id(), entry->base_name());
 }
 
 void DriveResourceMetadata::RemoveDirectoryChildren(
     const std::string& directory_resource_id) {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
 
   std::vector<std::string> children;
   storage_->GetChildren(directory_resource_id, &children);
   for (size_t i = 0; i < children.size(); ++i)
@@ skipping 129 matching lines @@
   storage_->PutEntry(
       CreateEntryWithProperBaseName(proto.drive_directory().drive_entry()));
   AddDescendantsFromProto(proto.drive_directory());
 
   storage_->SetLargestChangestamp(proto.largest_changestamp());
 
   return true;
 }
 
 }  // namespace drive