drive: Change the return type of ResourceMetadata's methods to FileError

chrome/browser/chromeos/drive/file_system/copy_operation.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/file_system/copy_operation.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/task_runner_util.h"
@@ skipping 169 matching lines @@
     return error;
   entry.set_parent_local_id(parent_local_id);
 
   std::string local_id;
   error = metadata->AddEntry(entry, &local_id);
   // Depending on timing, the metadata may have inserted via change list
   // already. So, FILE_ERROR_EXISTS is not an error.
   if (error == FILE_ERROR_EXISTS)
     error = metadata->GetIdByResourceId(entry.resource_id(), &local_id);
 
-  if (error == FILE_ERROR_OK)
-    *file_path = metadata->GetFilePath(local_id);
+  if (error != FILE_ERROR_OK)
+    return error;
 
-  return error;
+  return metadata->GetFilePath(local_id, file_path);
 }
 
 // Stores the file at |local_file_path| to the cache as a content of entry at
 // |remote_dest_path|, and marks it dirty.
 FileError UpdateLocalStateForScheduleTransfer(
     internal::ResourceMetadata* metadata,
     internal::FileCache* cache,
     const base::FilePath& local_src_path,
     const base::FilePath& remote_dest_path,
     std::string* local_id) {
@@ skipping 52 matching lines @@
     return error;
   params->local_id = entry.local_id();
 
   if (entry.parent_local_id() == util::kDriveOtherDirLocalId) {
     params->location_type = IS_ORPHAN;
     entry.set_title(params->new_title);
     entry.set_parent_local_id(params->parent_local_id);
     entry.set_metadata_edit_state(ResourceEntry::DIRTY);
     entry.set_modification_date(base::Time::Now().ToInternalValue());
     error = metadata->RefreshEntry(entry);
-    if (error == FILE_ERROR_OK)
-      params->changed_path = metadata->GetFilePath(local_id);
-    return error;
+    if (error != FILE_ERROR_OK)
+      return error;
+    return metadata->GetFilePath(local_id, &params->changed_path);
   }
 
   params->location_type = HAS_PARENT;
   return FILE_ERROR_OK;
 }
 
 }  // namespace
 
 CopyOperation::CopyOperation(base::SequencedTaskRunner* blocking_task_runner,
                              OperationObserver* observer,
@@ skipping 301 matching lines @@
 
   if (error == FILE_ERROR_OK) {
     observer_->OnDirectoryChangedByOperation(remote_dest_path.DirName());
     observer_->OnEntryUpdatedByOperation(*local_id);
   }
   callback.Run(error);
 }
 
 }  // namespace file_system
 }  // namespace drive