drive: Remove FileCacheObserver::OnCacheCommitted

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 114 matching lines @@
 
     FileError error = FILE_ERROR_OK;
     cache_->StoreOnUIThread(
         resource_id, md5, source_path,
         FileCache::FILE_OPERATION_COPY,
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     VerifyCacheFileState(error, resource_id, md5);
   }
 
-  void TestStoreLocallyModifiedToCache(
-      const std::string& resource_id,
-      const std::string& md5,
-      const base::FilePath& source_path,
-      FileError expected_error,
-      int expected_cache_state,
-      FileCache::CacheSubDirectoryType expected_sub_dir_type) {
-    expected_error_ = expected_error;
-    expected_cache_state_ = expected_cache_state;
-    expected_sub_dir_type_ = expected_sub_dir_type;
-
-    FileError error = FILE_ERROR_OK;
-    cache_->StoreLocallyModifiedOnUIThread(
-        resource_id, md5, source_path,
-        FileCache::FILE_OPERATION_COPY,
-        google_apis::test_util::CreateCopyResultCallback(&error));
-    google_apis::test_util::RunBlockingPoolTask();
-    VerifyCacheFileState(error, resource_id, md5);
-  }
-
   void TestRemoveFromCache(const std::string& resource_id,
                            FileError expected_error) {
     expected_error_ = expected_error;
 
     FileError error = FILE_ERROR_OK;
     cache_->RemoveOnUIThread(
         resource_id,
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     VerifyRemoveFromCache(error, resource_id, "");
@@ skipping 114 matching lines @@
 
       EXPECT_EQ(FILE_ERROR_OK, error);
       base::FilePath base_name = cache_file_path.BaseName();
       EXPECT_EQ(util::EscapeCacheFileName(resource_id) +
                 base::FilePath::kExtensionSeparator +
                 "local",
                 base_name.value());
     }
   }
 
-  void TestCommitDirty(
-      const std::string& resource_id,
-      const std::string& md5,
-      FileError expected_error,
-      int expected_cache_state,
-      FileCache::CacheSubDirectoryType expected_sub_dir_type) {
-    expected_error_ = expected_error;
-    expected_cache_state_ = expected_cache_state;
-    expected_sub_dir_type_ = expected_sub_dir_type;
-
-    FileError error = FILE_ERROR_OK;
-    cache_->CommitDirtyOnUIThread(
-        resource_id, md5,
-        google_apis::test_util::CreateCopyResultCallback(&error));
-    google_apis::test_util::RunBlockingPoolTask();
-    VerifyCacheFileState(error, resource_id, md5);
-  }
-
   void TestClearDirty(
       const std::string& resource_id,
       const std::string& md5,
       FileError expected_error,
       int expected_cache_state,
       FileCache::CacheSubDirectoryType expected_sub_dir_type) {
     expected_error_ = expected_error;
     expected_cache_state_ = expected_cache_state;
     expected_sub_dir_type_ = expected_sub_dir_type;
 
@@ skipping 242 matching lines @@
   md5 = "new_md5";
   TestStoreToCache(resource_id, md5, dummy_file_path_,
                    FILE_ERROR_OK, test_util::TEST_CACHE_STATE_PRESENT,
                    FileCache::CACHE_TYPE_TMP);
 
   // Verify that there's only one file with name <resource_id>, i.e. previously
   // cached file with the different md5 should be deleted.
   EXPECT_EQ(1U, CountCacheFiles(resource_id, md5));
 }
 
-TEST_F(FileCacheTestOnUIThread, LocallyModifiedSimple) {
-  std::string resource_id("pdf:1a2b");
-  std::string md5("abcdef0123456789");
-
-  const int kDirtyCacheState =
-      test_util::TEST_CACHE_STATE_PRESENT |
-      test_util::TEST_CACHE_STATE_DIRTY |
-      test_util::TEST_CACHE_STATE_PERSISTENT;
-
-  EXPECT_CALL(*mock_cache_observer_, OnCacheCommitted(resource_id)).Times(1);
-  TestStoreLocallyModifiedToCache(
-      resource_id, md5,
-      dummy_file_path_,
-      FILE_ERROR_OK, kDirtyCacheState, FileCache::CACHE_TYPE_PERSISTENT);
-}
 
 TEST_F(FileCacheTestOnUIThread, GetFromCacheSimple) {
   std::string resource_id("pdf:1a2b");
   std::string md5("abcdef0123456789");
   // First store a file to cache.
   TestStoreToCache(resource_id, md5, dummy_file_path_,
                    FILE_ERROR_OK, test_util::TEST_CACHE_STATE_PRESENT,
                    FileCache::CACHE_TYPE_TMP);
 
   // Then try to get the existing file from cache.
@@ skipping 179 matching lines @@
           test_util::TEST_CACHE_STATE_PINNED |
           test_util::TEST_CACHE_STATE_PERSISTENT,
           FileCache::CACHE_TYPE_PERSISTENT);
 
   TestRemoveFromCache(resource_id, FILE_ERROR_OK);
 }
 
 TEST_F(FileCacheTestOnUIThread, DirtyCacheSimple) {
   std::string resource_id("pdf:1a2b");
   std::string md5("abcdef0123456789");
-  EXPECT_CALL(*mock_cache_observer_, OnCacheCommitted(resource_id)).Times(1);
 
   // First store a file to cache.
   TestStoreToCache(resource_id, md5, dummy_file_path_,
                    FILE_ERROR_OK, test_util::TEST_CACHE_STATE_PRESENT,
                    FileCache::CACHE_TYPE_TMP);
 
   // Mark the file dirty.
   TestMarkDirty(resource_id, md5, FILE_ERROR_OK,
                 test_util::TEST_CACHE_STATE_PRESENT |
                 test_util::TEST_CACHE_STATE_DIRTY |
                 test_util::TEST_CACHE_STATE_PERSISTENT,
                 FileCache::CACHE_TYPE_PERSISTENT);
 
-  // Commit the file dirty.
-  TestCommitDirty(resource_id, md5, FILE_ERROR_OK,
-                  test_util::TEST_CACHE_STATE_PRESENT |
-                  test_util::TEST_CACHE_STATE_DIRTY |
-                  test_util::TEST_CACHE_STATE_PERSISTENT,
-                  FileCache::CACHE_TYPE_PERSISTENT);
-
   // Clear dirty state of the file.
   TestClearDirty(resource_id, md5, FILE_ERROR_OK,
                  test_util::TEST_CACHE_STATE_PRESENT,
                  FileCache::CACHE_TYPE_TMP);
 }
 
 TEST_F(FileCacheTestOnUIThread, DirtyCachePinned) {
   std::string resource_id("pdf:1a2b");
   std::string md5("abcdef0123456789");
   EXPECT_CALL(*mock_cache_observer_, OnCachePinned(resource_id, md5)).Times(1);
-  EXPECT_CALL(*mock_cache_observer_, OnCacheCommitted(resource_id)).Times(1);
 
   // First store a file to cache and pin it.
   TestStoreToCache(resource_id, md5, dummy_file_path_,
                    FILE_ERROR_OK, test_util::TEST_CACHE_STATE_PRESENT,
                    FileCache::CACHE_TYPE_TMP);
   TestPin(resource_id, md5, FILE_ERROR_OK,
           test_util::TEST_CACHE_STATE_PRESENT |
           test_util::TEST_CACHE_STATE_PINNED |
           test_util::TEST_CACHE_STATE_PERSISTENT,
           FileCache::CACHE_TYPE_PERSISTENT);
 
   // Mark the file dirty.
   TestMarkDirty(resource_id, md5, FILE_ERROR_OK,
                 test_util::TEST_CACHE_STATE_PRESENT |
                 test_util::TEST_CACHE_STATE_DIRTY |
                 test_util::TEST_CACHE_STATE_PINNED |
                 test_util::TEST_CACHE_STATE_PERSISTENT,
                 FileCache::CACHE_TYPE_PERSISTENT);
 
-  // Commit the file dirty.
-  TestCommitDirty(resource_id, md5, FILE_ERROR_OK,
-                  test_util::TEST_CACHE_STATE_PRESENT |
-                  test_util::TEST_CACHE_STATE_DIRTY |
-                  test_util::TEST_CACHE_STATE_PINNED |
-                  test_util::TEST_CACHE_STATE_PERSISTENT,
-                  FileCache::CACHE_TYPE_PERSISTENT);
-
   // Clear dirty state of the file.
   TestClearDirty(resource_id, md5, FILE_ERROR_OK,
                  test_util::TEST_CACHE_STATE_PRESENT |
                  test_util::TEST_CACHE_STATE_PINNED |
                  test_util::TEST_CACHE_STATE_PERSISTENT,
                  FileCache::CACHE_TYPE_PERSISTENT);
 }
 
 TEST_F(FileCacheTestOnUIThread, PinAndUnpinDirtyCache) {
   std::string resource_id("pdf:1a2b");
@@ skipping 40 matching lines @@
             test_util::TEST_CACHE_STATE_PERSISTENT,
             FileCache::CACHE_TYPE_PERSISTENT);
 
   // Verify dirty file still exist at the same pathname.
   EXPECT_TRUE(file_util::PathExists(dirty_path));
 }
 
 TEST_F(FileCacheTestOnUIThread, DirtyCacheRepetitive) {
   std::string resource_id("pdf:1a2b");
   std::string md5("abcdef0123456789");
-  EXPECT_CALL(*mock_cache_observer_, OnCacheCommitted(resource_id)).Times(3);
 
   // First store a file to cache.
   TestStoreToCache(resource_id, md5, dummy_file_path_,
                    FILE_ERROR_OK, test_util::TEST_CACHE_STATE_PRESENT,
                    FileCache::CACHE_TYPE_TMP);
 
   // Mark the file dirty.
   TestMarkDirty(resource_id, md5, FILE_ERROR_OK,
                 test_util::TEST_CACHE_STATE_PRESENT |
                 test_util::TEST_CACHE_STATE_DIRTY |
                 test_util::TEST_CACHE_STATE_PERSISTENT,
                 FileCache::CACHE_TYPE_PERSISTENT);
 
   // Again, mark the file dirty.  Nothing should change.
   TestMarkDirty(resource_id, md5, FILE_ERROR_OK,
                 test_util::TEST_CACHE_STATE_PRESENT |
                 test_util::TEST_CACHE_STATE_DIRTY |
                 test_util::TEST_CACHE_STATE_PERSISTENT,
                 FileCache::CACHE_TYPE_PERSISTENT);
 
-  // Commit the file dirty.
-  TestCommitDirty(resource_id, md5, FILE_ERROR_OK,
-                  test_util::TEST_CACHE_STATE_PRESENT |
-                  test_util::TEST_CACHE_STATE_DIRTY |
-                  test_util::TEST_CACHE_STATE_PERSISTENT,
-                  FileCache::CACHE_TYPE_PERSISTENT);
-
-  // Again, commit the file dirty.  Nothing should change.
-  TestCommitDirty(resource_id, md5, FILE_ERROR_OK,
-                  test_util::TEST_CACHE_STATE_PRESENT |
-                  test_util::TEST_CACHE_STATE_DIRTY |
-                  test_util::TEST_CACHE_STATE_PERSISTENT,
-                  FileCache::CACHE_TYPE_PERSISTENT);
-
-  // Mark the file dirty again after it's being committed.
-  TestMarkDirty(resource_id, md5, FILE_ERROR_OK,
-                test_util::TEST_CACHE_STATE_PRESENT |
-                test_util::TEST_CACHE_STATE_DIRTY |
-                test_util::TEST_CACHE_STATE_PERSISTENT,
-                FileCache::CACHE_TYPE_PERSISTENT);
-
-  // Commit the file dirty.
-  TestCommitDirty(resource_id, md5, FILE_ERROR_OK,
-                  test_util::TEST_CACHE_STATE_PRESENT |
-                  test_util::TEST_CACHE_STATE_DIRTY |
-                  test_util::TEST_CACHE_STATE_PERSISTENT,
-                  FileCache::CACHE_TYPE_PERSISTENT);
-
   // Clear dirty state of the file.
   TestClearDirty(resource_id, md5, FILE_ERROR_OK,
                  test_util::TEST_CACHE_STATE_PRESENT,
                  FileCache::CACHE_TYPE_TMP);
 
   // Again, clear dirty state of the file, which is no longer dirty.
   TestClearDirty(resource_id, md5, FILE_ERROR_INVALID_OPERATION,
                  test_util::TEST_CACHE_STATE_PRESENT,
                  FileCache::CACHE_TYPE_TMP);
 }
@@ skipping 35 matching lines @@
                    test_util::TEST_CACHE_STATE_PRESENT |
                    test_util::TEST_CACHE_STATE_DIRTY |
                    test_util::TEST_CACHE_STATE_PERSISTENT,
                    FileCache::CACHE_TYPE_PERSISTENT);
 }
 
 TEST_F(FileCacheTestOnUIThread, RemoveFromDirtyCache) {
   std::string resource_id("pdf:1a2b");
   std::string md5("abcdef0123456789");
   EXPECT_CALL(*mock_cache_observer_, OnCachePinned(resource_id, md5)).Times(1);
-  EXPECT_CALL(*mock_cache_observer_, OnCacheCommitted(resource_id)).Times(1);
 
   // Store a file to cache, pin it, mark it dirty and commit it.
   TestStoreToCache(resource_id, md5, dummy_file_path_,
                    FILE_ERROR_OK, test_util::TEST_CACHE_STATE_PRESENT,
                    FileCache::CACHE_TYPE_TMP);
   TestPin(resource_id, md5, FILE_ERROR_OK,
           test_util::TEST_CACHE_STATE_PRESENT |
           test_util::TEST_CACHE_STATE_PINNED |
           test_util::TEST_CACHE_STATE_PERSISTENT,
           FileCache::CACHE_TYPE_PERSISTENT);
   TestMarkDirty(resource_id, md5, FILE_ERROR_OK,
                 test_util::TEST_CACHE_STATE_PRESENT |
                 test_util::TEST_CACHE_STATE_PINNED |
                 test_util::TEST_CACHE_STATE_DIRTY |
                 test_util::TEST_CACHE_STATE_PERSISTENT,
                 FileCache::CACHE_TYPE_PERSISTENT);
-  TestCommitDirty(resource_id, md5, FILE_ERROR_OK,
-                  test_util::TEST_CACHE_STATE_PRESENT |
-                  test_util::TEST_CACHE_STATE_PINNED |
-                  test_util::TEST_CACHE_STATE_DIRTY |
-                  test_util::TEST_CACHE_STATE_PERSISTENT,
-                  FileCache::CACHE_TYPE_PERSISTENT);
 
   // Try to remove the file.  Since file is dirty, it should not be removed.
   TestRemoveFromCache(resource_id, FILE_ERROR_OK);
 }
 
 TEST_F(FileCacheTestOnUIThread, MountUnmount) {
   std::string resource_id("pdf:1a2b");
   std::string md5("abcdef0123456789");
 
   // First store a file to cache in the tmp subdir.
@@ skipping 32 matching lines @@
 TEST_F(FileCacheTestOnUIThread, Iterate) {
   const std::vector<test_util::TestCacheResource> cache_resources(
       test_util::GetDefaultTestCacheResources());
   // Set mock expectations.
   for (size_t i = 0; i < cache_resources.size(); ++i) {
     if (cache_resources[i].is_pinned) {
       EXPECT_CALL(*mock_cache_observer_,
                   OnCachePinned(cache_resources[i].resource_id,
                                 cache_resources[i].md5)).Times(1);
     }
-    if (cache_resources[i].is_dirty) {
-      EXPECT_CALL(*mock_cache_observer_,
-                  OnCacheCommitted(cache_resources[i].resource_id)).Times(1);
-    }
   }
   ASSERT_TRUE(test_util::PrepareTestCacheResources(
       cache_.get(),
       cache_resources));
 
   std::vector<std::string> resource_ids;
   std::vector<FileCacheEntry> cache_entries;
   bool completed = false;
   cache_->IterateOnUIThread(
       base::Bind(&OnIterate, &resource_ids, &cache_entries),
@@ skipping 215 matching lines @@
   EXPECT_TRUE(cache_->GetCacheEntry(resource_id_pinned, md5_pinned, &entry));
   EXPECT_TRUE(file_util::PathExists(pinned_path));
 
   // Returns false when disk space cannot be freed.
   fake_free_disk_space_getter_->set_default_value(0);
   EXPECT_FALSE(cache_->FreeDiskSpaceIfNeededFor(kNeededBytes));
 }
 
 }  // namespace internal
 }  // namespace drive