Reimplement MoveOperation.

chrome/browser/chromeos/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/resource_metadata.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 429 matching lines @@
 
   ResourceEntry old_entry;
   if (!storage_->GetEntry(entry.resource_id(), &old_entry))
     return FILE_ERROR_NOT_FOUND;
 
   if (old_entry.parent_local_id().empty() ||  // Reject root.
       old_entry.file_info().is_directory() !=  // Reject incompatible input.
       entry.file_info().is_directory())
     return FILE_ERROR_INVALID_OPERATION;
 
-  // Update data.
+  // Make sure that the new parent exists and it is a directory.
   ResourceEntry new_parent;
-  if (!storage_->GetEntry(entry.parent_local_id(), &new_parent) ||
-      !new_parent.file_info().is_directory())
+  if (!storage_->GetEntry(entry.parent_local_id(), &new_parent))
     return FILE_ERROR_NOT_FOUND;
 
+  if (!new_parent.file_info().is_directory())
+    return FILE_ERROR_NOT_A_DIRECTORY;
+
   // Remove from the old parent and add it to the new parent with the new data.
   if (!PutEntryUnderDirectory(entry))
     return FILE_ERROR_FAILED;
   return FILE_ERROR_OK;
 }
 
 void ResourceMetadata::RefreshDirectoryOnUIThread(
     const DirectoryFetchInfo& directory_fetch_info,
     const ResourceEntryMap& entry_map,
     const FileMoveCallback& callback) {
@@ skipping 302 matching lines @@
     for (size_t i = 0; i < children.size(); ++i) {
       if (!RemoveEntryRecursively(children[i]))
         return false;
     }
   }
   return storage_->RemoveEntry(resource_id);
 }
 
 }  // namespace internal
 }  // namespace drive