drive: Change FileCache::GetCacheEntry's return type 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 37 matching lines @@
   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;
 
   FileCacheEntry cache_entry;
-  cache->GetCacheEntry(local_id, &cache_entry);
+  error = cache->GetCacheEntry(local_id, &cache_entry);
+  if (error != FILE_ERROR_OK && error != FILE_ERROR_NOT_FOUND)
+    return error;
   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,
                          FileCache::FILE_OPERATION_MOVE);
     if (error != FILE_ERROR_OK)
       return error;
-    if (!cache->GetCacheEntry(local_id, &cache_entry))
-      return FILE_ERROR_NOT_FOUND;
+    error = cache->GetCacheEntry(local_id, &cache_entry);
+    if (error != FILE_ERROR_OK)
+      return error;
   }
 
   // Check if content update is needed or not.
   if (cache_entry.is_dirty() && !cache->IsOpenedForWrite(local_id)) {
     // Update cache entry's MD5 if needed.
     if (cache_entry.md5().empty()) {
       error = cache->UpdateMd5(local_id);
       if (error != FILE_ERROR_OK)
         return error;
-      if (!cache->GetCacheEntry(local_id, &cache_entry))
-        return FILE_ERROR_NOT_FOUND;
+      error = cache->GetCacheEntry(local_id, &cache_entry);
+      if (error != FILE_ERROR_OK)
+        return error;
     }
 
     if (cache_entry.md5() == local_state->entry.file_specific_info().md5()) {
       error = cache->ClearDirty(local_id);
       if (error != FILE_ERROR_OK)
         return error;
     } else {
       error = cache->GetFile(local_id, &local_state->cache_file_path);
       if (error != FILE_ERROR_OK)
         return error;
@@ skipping 62 matching lines @@
   }
   if (!entry.file_info().is_directory())
     entry.mutable_file_specific_info()->set_md5(resource_entry->file_md5());
   entry.set_resource_id(resource_entry->resource_id());
   error = metadata->RefreshEntry(entry);
   if (error != FILE_ERROR_OK)
     return error;
 
   // Clear dirty bit unless the file has been edited during update.
   FileCacheEntry cache_entry;
-  if (cache->GetCacheEntry(local_id, &cache_entry) &&
-      cache_entry.is_dirty() &&
+  error = cache->GetCacheEntry(local_id, &cache_entry);
+  if (error != FILE_ERROR_OK && error != FILE_ERROR_NOT_FOUND)
+    return error;
+  if (cache_entry.is_dirty() &&
       cache_entry.md5() == entry.file_specific_info().md5()) {
     error = cache->ClearDirty(local_id);
     if (error != FILE_ERROR_OK)
       return error;
   }
   return FILE_ERROR_OK;
 }
 
 }  // namespace
 
@@ skipping 206 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