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

chrome/browser/chromeos/drive/sync/entry_update_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_update_performer.h"
 
 #include "base/callback_helpers.h"
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 32 matching lines @@
   FileError error = metadata->GetResourceEntryById(local_id,
                                                    &local_state->entry);
   if (error != FILE_ERROR_OK)
     return error;
 
   error = metadata->GetResourceEntryById(local_state->entry.parent_local_id(),
                                          &local_state->parent_entry);
   if (error != FILE_ERROR_OK)
     return error;
 
-  local_state->drive_file_path = metadata->GetFilePath(local_id);
-  if (local_state->drive_file_path.empty())
-    return FILE_ERROR_NOT_FOUND;
+  error = metadata->GetFilePath(local_id, &local_state->drive_file_path);
+  if (error != FILE_ERROR_OK)
+    return error;
 
   FileCacheEntry cache_entry;
   cache->GetCacheEntry(local_id, &cache_entry);
   if (!local_state->entry.file_info().is_directory() &&
       !cache_entry.is_present() && local_state->entry.resource_id().empty()) {
     // Locally created file with no cache file, store an empty file.
     base::FilePath empty_file;
     if (!base::CreateTemporaryFile(&empty_file))
       return FILE_ERROR_FAILED;
     error = cache->Store(local_id, std::string(), empty_file,
@@ skipping 50 matching lines @@
                        scoped_ptr<google_apis::ResourceEntry> resource_entry,
                        base::FilePath* changed_directory) {
   // When creating new entries, update check may add a new entry with the same
   // resource ID before us. If such an entry exists, remove it.
   std::string existing_local_id;
   FileError error = metadata->GetIdByResourceId(
       resource_entry->resource_id(), &existing_local_id);
   switch (error) {
     case FILE_ERROR_OK:
       if (existing_local_id != local_id) {
-        base::FilePath existing_entry_path =
-            metadata->GetFilePath(existing_local_id);
+        base::FilePath existing_entry_path;
+        error = metadata->GetFilePath(existing_local_id, &existing_entry_path);
+        if (error != FILE_ERROR_OK)
+          return error;
         error = metadata->RemoveEntry(existing_local_id);
         if (error != FILE_ERROR_OK)
           return error;
         *changed_directory = existing_entry_path.DirName();
       }
       break;
     case FILE_ERROR_NOT_FOUND:
       break;
     default:
       return error;
@@ skipping 244 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (!changed_directory->empty())
     observer_->OnDirectoryChangedByOperation(*changed_directory);
   callback.Run(error);
 }
 
 }  // namespace internal
 }  // namespace drive