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

chrome/browser/chromeos/drive/file_cache_unittest.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/file_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 750 matching lines @@
   // Store files. This file should not be moved.
   EXPECT_EQ(FILE_ERROR_OK, cache_->Store("id_foo", "md5", src_path,
                                          FileCache::FILE_OPERATION_COPY));
 
   // Set up files in the cache directory. These files should be moved.
   const base::FilePath file_directory =
       temp_dir_.path().AppendASCII(kCacheFileDirectory);
   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));
   EXPECT_TRUE(base::ContentsEqual(src_path,
                                   dest_directory.Append("image00000001.png")));
   EXPECT_TRUE(base::ContentsEqual(src_path,
                                   dest_directory.Append("image00000002.png")));
   EXPECT_FALSE(base::PathExists(dest_directory.Append("image00000003.png")));
 }
 
@@ skipping 166 matching lines @@
   // Clear cache.
   EXPECT_TRUE(cache_->ClearAll());
 
   // Verify that the cache is removed.
   EXPECT_FALSE(cache_->GetCacheEntry(id, &cache_entry));
   EXPECT_TRUE(file_util::IsDirectoryEmpty(cache_files_dir_));
 }
 
 }  // namespace internal
 }  // namespace drive