drive: Remove FileCacheObserver::OnCacheCommitted

chrome/browser/chromeos/drive/sync_client_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/sync_client.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 46 matching lines @@
 
   void set_resource_id_to_be_cancelled(const std::string& resource_id) {
     resource_id_to_be_cancelled_ = resource_id;
   }
 
  private:
   std::string resource_id_to_be_cancelled_;
 };
 
 class DummyOperationObserver : public file_system::OperationObserver {
+  // OperationObserver override:
   virtual void OnDirectoryChangedByOperation(
       const base::FilePath& path) OVERRIDE {}
+  virtual void OnCacheFileUploadNeededByOperation(
+      const std::string& resource_id) OVERRIDE {}
 };
 
 }  // namespace
 
 class SyncClientTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     profile_.reset(new TestingProfile);
@@ skipping 166 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // The file should be unpinned if the user wants the download to be cancelled.
   FileCacheEntry cache_entry;
   EXPECT_FALSE(cache_->GetCacheEntry(resource_ids_["foo"], std::string(),
                                      &cache_entry));
 }
 
 TEST_F(SyncClientTest, OnCacheUnpinned) {
-  sync_client_->AddResourceIdForTesting(SyncClient::FETCH,
-                                        resource_ids_["foo"]);
-  sync_client_->AddResourceIdForTesting(SyncClient::FETCH,
-                                        resource_ids_["bar"]);
-  sync_client_->AddResourceIdForTesting(SyncClient::FETCH,
-                                        resource_ids_["baz"]);
+  sync_client_->AddFetchTask(resource_ids_["foo"]);
+  sync_client_->AddFetchTask(resource_ids_["bar"]);
+  sync_client_->AddFetchTask(resource_ids_["baz"]);
   ASSERT_EQ(3U,
             sync_client_->GetResourceIdsForTesting(SyncClient::FETCH).size());
 
   sync_client_->OnCacheUnpinned(resource_ids_["foo"], std::string());
   sync_client_->OnCacheUnpinned(resource_ids_["baz"], std::string());
   base::RunLoop().RunUntilIdle();
 
   // Only "bar" should be fetched.
   FileCacheEntry cache_entry;
   EXPECT_TRUE(cache_->GetCacheEntry(resource_ids_["foo"], std::string(),
                                     &cache_entry));
   EXPECT_FALSE(cache_entry.is_present());
 
   EXPECT_TRUE(cache_->GetCacheEntry(resource_ids_["bar"], std::string(),
                                     &cache_entry));
   EXPECT_TRUE(cache_entry.is_present());
 
   EXPECT_TRUE(cache_->GetCacheEntry(resource_ids_["baz"], std::string(),
                                     &cache_entry));
   EXPECT_FALSE(cache_entry.is_present());
 
 }
 
 TEST_F(SyncClientTest, Deduplication) {
-  sync_client_->AddResourceIdForTesting(SyncClient::FETCH,
-                                        resource_ids_["foo"]);
+  sync_client_->AddFetchTask(resource_ids_["foo"]);
 
   // Set the delay so that DoSyncLoop() is delayed.
   sync_client_->set_delay_for_testing(TestTimeouts::action_max_timeout());
   // Raise OnCachePinned() event. This shouldn't result in adding the second
   // task, as tasks are de-duplicated.
   sync_client_->OnCachePinned(resource_ids_["foo"], std::string());
 
   ASSERT_EQ(1U,
             sync_client_->GetResourceIdsForTesting(SyncClient::FETCH).size());
 }
@@ skipping 15 matching lines @@
   content.clear();
 
   EXPECT_EQ(FILE_ERROR_OK, cache_->GetFile(resource_ids_["dirty"],
                                            std::string(), &cache_file));
   EXPECT_TRUE(file_util::ReadFileToString(cache_file, &content));
   EXPECT_EQ(kLocalContent, content);
 }
 
 }  // namespace internal
 }  // namespace drive