drive: Recover cache entries from trashed DB to filter out non-dirty cache files

chrome/browser/chromeos/drive/drive_integration_service.cc

Index: chrome/browser/chromeos/drive/drive_integration_service.cc
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
index 66a3b4bd4f652e202715633dd15fcf5d58aa8c66..aae5cf21ce349b1911cd9e373a849fb99fd15bf0 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -143,9 +143,14 @@ FileError InitializeMetadata(
           .InsertBeforeExtensionASCII(base::StringPrintf(" (%d)", uniquifier));
     }
 
+    std::map<std::string, FileCacheEntry> recovered_cache_entries;
+    metadata_storage->RecoverCacheEntriesFromTrashedResourceMap(
+        &recovered_cache_entries);
+
     LOG(INFO) << "DB could not be opened for some reasons. "
               << "Recovering cache files to " << dest_directory.value();
-    if (!cache->RecoverFilesFromCacheDirectory(dest_directory)) {
+    if (!cache->RecoverFilesFromCacheDirectory(dest_directory,
+                                               recovered_cache_entries)) {
       LOG(WARNING) << "Failed to recover cache files.";
       return FILE_ERROR_FAILED;
     }