Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7012)

Unified Diff: chrome/browser/chromeos/drive/file_cache_unittest.cc

Issue 54223003: drive: Recover cache entries from trashed DB to filter out non-dirty cache files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/file_cache_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc
index 4edacdd1bb4fb693d705f2b1f182fea392e3a847..493fe0f2cf6e66507b34d1dd0c3a7c918fccc456 100644
--- a/chrome/browser/chromeos/drive/file_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc
@@ -768,9 +768,15 @@ TEST_F(FileCacheTest, RecoverFilesFromCacheDirectory) {
ASSERT_TRUE(base::CopyFile(src_path, file_directory.AppendASCII("id_bar")));
ASSERT_TRUE(base::CopyFile(src_path, file_directory.AppendASCII("id_baz")));
+ // Insert a dirty entry with "id_baz" to |recovered_cache_entries|.
+ // This should not prevent the file from being recovered.
+ std::map<std::string, FileCacheEntry> recovered_cache_entries;
+ recovered_cache_entries["id_baz"].set_is_dirty(true);
+
// Recover files.
const base::FilePath dest_directory = temp_dir_.path().AppendASCII("dest");
- EXPECT_TRUE(cache_->RecoverFilesFromCacheDirectory(dest_directory));
+ EXPECT_TRUE(cache_->RecoverFilesFromCacheDirectory(dest_directory,
+ recovered_cache_entries));
// Only two files should be recovered.
EXPECT_TRUE(base::PathExists(dest_directory));
« no previous file with comments | « chrome/browser/chromeos/drive/file_cache.cc ('k') | chrome/browser/chromeos/drive/resource_metadata_storage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698