chromeos: Change DriveCache::MarkAsMounted to take a resource-id/md5 pair as arguments
MarkAsMounted and MarkAsUnmounted are the only methods which take FilePath as their arguments to perform cache operations.
This is not quite right.
BUG=160487
TEST=unit_tests --gtest_filter="DriveCache*", try mounting zip files from both Downloads and Google Drive directories
Review URL: https://chromiumcodereview.appspot.com/12208043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181249 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/drive/drive_cache_unittest.cc b/chrome/browser/chromeos/drive/drive_cache_unittest.cc
index f0e311a..d5831c5 100644
--- a/chrome/browser/chromeos/drive/drive_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_cache_unittest.cc
@@ -458,7 +458,6 @@
void TestMarkAsMounted(
const std::string& resource_id,
const std::string& md5,
- const FilePath& file_path,
DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
@@ -470,7 +469,8 @@
DriveFileError error = DRIVE_FILE_OK;
FilePath cache_file_path;
cache_->MarkAsMounted(
- file_path,
+ resource_id,
+ md5,
base::Bind(&test_util::CopyResultsFromGetFileFromCacheCallback,
&error, &cache_file_path));
google_apis::test_util::RunBlockingPoolTask();
@@ -1271,10 +1271,8 @@
DriveCache::CACHE_TYPE_TMP);
// Mark the file mounted.
- file_path = cache_->GetCacheFilePath(resource_id, md5,
- DriveCache::CACHE_TYPE_TMP,
- DriveCache::CACHED_FILE_FROM_SERVER);
- TestMarkAsMounted(resource_id, md5, file_path,
+ TestMarkAsMounted(resource_id,
+ md5,
DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_MOUNTED |
