drive: Use base_name recovered from trashed DB when DB corruption happens

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 aae5cf21ce349b1911cd9e373a849fb99fd15bf0..b5bdb7c725282b9aaac0d88826a8c88ab6904372 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -143,14 +143,15 @@ FileError InitializeMetadata(
           .InsertBeforeExtensionASCII(base::StringPrintf(" (%d)", uniquifier));
     }
 
-    std::map<std::string, FileCacheEntry> recovered_cache_entries;
-    metadata_storage->RecoverCacheEntriesFromTrashedResourceMap(
-        &recovered_cache_entries);
+    internal::ResourceMetadataStorage::RecoveredCacheInfoMap
+        recovered_cache_info;
+    metadata_storage->RecoverCacheInfoFromTrashedResourceMap(
+        &recovered_cache_info);
 
     LOG(INFO) << "DB could not be opened for some reasons. "
               << "Recovering cache files to " << dest_directory.value();
     if (!cache->RecoverFilesFromCacheDirectory(dest_directory,
-                                               recovered_cache_entries)) {
+                                               recovered_cache_info)) {
       LOG(WARNING) << "Failed to recover cache files.";
       return FILE_ERROR_FAILED;
     }