drive: Change FileCache::GetCacheEntry's return type to FileError

chrome/browser/chromeos/drive/file_system/download_operation.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/file_system/download_operation.h"
 
 #include "base/callback_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 101 matching lines @@
         !base::GetFileInfo(gdoc_file_path,
                            reinterpret_cast<base::File::Info*>(&file_info)))
       return FILE_ERROR_FAILED;
 
     *cache_file_path = gdoc_file_path;
     SetPlatformFileInfoToResourceEntry(file_info, entry);
     return FILE_ERROR_OK;
   }
 
   FileCacheEntry cache_entry;
-  if (!cache->GetCacheEntry(local_id, &cache_entry) ||
-      !cache_entry.is_present()) {  // This file has no cache file.
+  error = cache->GetCacheEntry(local_id, &cache_entry);
+  if (error != FILE_ERROR_OK && error != FILE_ERROR_NOT_FOUND)
+    return error;
+  if (!cache_entry.is_present()) {  // This file has no cache file.
     if (!entry->resource_id().empty()) {
       // This entry exists on the server, leave |cache_file_path| empty to
       // start download.
       return PrepareForDownloadFile(cache, entry->file_info().size(),
                                     temporary_file_directory,
                                     temp_download_file_path);
     }
 
     // This entry does not exist on the server, store an empty file and mark it
     // as dirty.
     base::FilePath empty_file;
     if (!base::CreateTemporaryFileInDir(temporary_file_directory, &empty_file))
       return FILE_ERROR_FAILED;
     error = cache->Store(local_id, std::string(), empty_file,
                          internal::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;
   }
 
   // Leave |cache_file_path| empty when the stored file is obsolete and has no
   // local modification.
   if (!cache_entry.is_dirty() &&
       entry->file_specific_info().md5() != cache_entry.md5()) {
     return PrepareForDownloadFile(cache, entry->file_info().size(),
                                   temporary_file_directory,
                                   temp_download_file_path);
   }
@@ skipping 69 matching lines @@
   base::ScopedClosureRunner file_deleter(base::Bind(
       base::IgnoreResult(&base::DeleteFile),
       downloaded_file_path, false /* recursive */));
 
   FileError error = GDataToFileError(gdata_error);
   if (error != FILE_ERROR_OK)
     return error;
 
   // Do not overwrite locally edited file with server side contents.
   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())
     return FILE_ERROR_IN_USE;
 
   // Here the download is completed successfully, so store it into the cache.
   error = cache->Store(local_id, md5, downloaded_file_path,
                        internal::FileCache::FILE_OPERATION_MOVE);
   if (error != FILE_ERROR_OK)
     return error;
   base::Closure unused_file_deleter_closure = file_deleter.Release();
 
   return cache->GetFile(local_id, cache_file_path);
@@ skipping 271 matching lines @@
   observer_->OnDirectoryChangedByOperation(file_path.DirName());
   params->OnComplete(*cache_file_path);
 }
 
 void DownloadOperation::CancelJob(JobID job_id) {
   scheduler_->CancelJob(job_id);
 }
 
 }  // namespace file_system
 }  // namespace drive