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

chrome/browser/chromeos/drive/drive_integration_service.cc

 // Copyright (c) 2012 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/drive_integration_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
@@ skipping 125 matching lines @@
     const std::string& dest_directory_name = l10n_util::GetStringUTF8(
         IDS_FILE_BROWSER_RECOVERED_FILES_FROM_GOOGLE_DRIVE_DIRECTORY_NAME);
     base::FilePath dest_directory = downloads_directory.Append(
         base::FilePath::FromUTF8Unsafe(dest_directory_name));
     for (int uniquifier = 1; base::PathExists(dest_directory); ++uniquifier) {
       dest_directory = downloads_directory.Append(
           base::FilePath::FromUTF8Unsafe(dest_directory_name))
           .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;
     }
   }
 
   FileError error = resource_metadata->Initialize();
   LOG_IF(WARNING, error != FILE_ERROR_OK)
       << "Failed to initialize resource metadata. " << FileErrorToString(error);
   return error;
 }
@@ skipping 429 matching lines @@
                                           NULL, base::FilePath(), NULL);
   } else {
     service = factory_for_test_.Run(profile);
   }
 
   service->SetEnabled(drive::util::IsDriveEnabledForProfile(profile));
   return service;
 }
 
 }  // namespace drive