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

chrome/browser/chromeos/drive/sync/entry_revert_performer.cc

 // Copyright 2013 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/sync/entry_revert_performer.h"
 
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
@@ skipping 22 matching lines @@
       break;
 
     case FILE_ERROR_NOT_FOUND:
       entry.set_deleted(true);
       break;
 
     default:
       return error;
   }
 
-  const base::FilePath original_path = metadata->GetFilePath(local_id);
+  base::FilePath original_path;
+  error = metadata->GetFilePath(local_id, &original_path);
+  if (error != FILE_ERROR_OK)
+    return error;
 
   if (entry.deleted()) {
     error = metadata->RemoveEntry(local_id);
     if (error != FILE_ERROR_OK)
       return error;
 
     changed_directories->insert(original_path.DirName());
   } else {
     error = ChangeListProcessor::SetParentLocalIdOfEntry(metadata, &entry,
                                                          parent_resource_id);
     if (error != FILE_ERROR_OK)
       return error;
 
     entry.set_local_id(local_id);
     error = metadata->RefreshEntry(entry);
     if (error != FILE_ERROR_OK)
       return error;
 
-    changed_directories->insert(metadata->GetFilePath(entry.parent_local_id()));
+    base::FilePath new_parent_path;
+    error = metadata->GetFilePath(entry.parent_local_id(), &new_parent_path);
+    if (error != FILE_ERROR_OK)
+      return error;
+    changed_directories->insert(new_parent_path);
     changed_directories->insert(original_path.DirName());
   }
   return FILE_ERROR_OK;
 }
 
 }  // namespace
 
 EntryRevertPerformer::EntryRevertPerformer(
     base::SequencedTaskRunner* blocking_task_runner,
     file_system::OperationObserver* observer,
@@ skipping 80 matching lines @@
 
   for (std::set<base::FilePath>::const_iterator it =
            changed_directories->begin(); it != changed_directories->end(); ++it)
     observer_->OnDirectoryChangedByOperation(*it);
 
   callback.Run(error);
 }
 
 }  // namespace internal
 }  // namespace drive