gdata: Remove a werid behavior from GDataCacheMetadata::UpdateCache()

chrome/browser/chromeos/gdata/gdata_cache_metadata_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/gdata/gdata_cache_metadata.h"
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 124 matching lines @@
 TEST_F(GDataCacheMetadataMapTest, CacheTest) {
   SetUpCacheMetadata();
 
   // Save an initial entry.
   std::string test_resource_id("test_resource_id");
   std::string test_file_md5("test_file_md5");
   GDataCache::CacheSubDirectoryType test_sub_dir_type =
       GDataCache::CACHE_TYPE_PERSISTENT;
   int test_cache_state = (CACHE_STATE_PRESENT |
                           CACHE_STATE_PERSISTENT);
-  metadata_->UpdateCache(
+  metadata_->AddOrUpdateCacheEntry(
       test_resource_id,
       GDataCacheEntry(test_file_md5, test_cache_state));
 
   // Test that the entry can be retrieved.
   scoped_ptr<GDataCacheEntry> cache_entry =
       metadata_->GetCacheEntry(test_resource_id, test_file_md5);
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ(test_file_md5, cache_entry->md5());
   EXPECT_EQ(test_sub_dir_type, GDataCache::GetSubDirectoryType(*cache_entry));
   EXPECT_EQ(test_cache_state, cache_entry->cache_state());
@@ skipping 11 matching lines @@
 
   // md5 doesn't match.
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, "mismatch_md5").Pass();
   EXPECT_FALSE(cache_entry.get());
 
   // Update all attributes.
   test_file_md5 = "test_file_md5_2";
   test_sub_dir_type = GDataCache::CACHE_TYPE_TMP;
   test_cache_state = CACHE_STATE_PINNED;
-  metadata_->UpdateCache(
+  metadata_->AddOrUpdateCacheEntry(
       test_resource_id,
       GDataCacheEntry(test_file_md5, test_cache_state));
 
   // Make sure the values took.
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, test_file_md5).Pass();
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ(test_file_md5, cache_entry->md5());
   EXPECT_EQ(test_sub_dir_type, GDataCache::GetSubDirectoryType(*cache_entry));
   EXPECT_EQ(test_cache_state, cache_entry->cache_state());
 
   // Empty m5 should work.
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ(test_file_md5, cache_entry->md5());
 
   // Test dirty cache.
   test_file_md5 = "test_file_md5_3";
   test_sub_dir_type = GDataCache::CACHE_TYPE_TMP;
   test_cache_state = CACHE_STATE_DIRTY;
-  metadata_->UpdateCache(
+  metadata_->AddOrUpdateCacheEntry(
       test_resource_id,
       GDataCacheEntry(test_file_md5, test_cache_state));
 
   // Make sure the values took.
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, test_file_md5).Pass();
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ(test_file_md5, cache_entry->md5());
   EXPECT_EQ(test_sub_dir_type, GDataCache::GetSubDirectoryType(*cache_entry));
   EXPECT_EQ(test_cache_state, cache_entry->cache_state());
 
   // Empty md5 should work.
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ(test_file_md5, cache_entry->md5());
 
   // Mismatched md5 should also work for dirty entries.
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, "mismatch_md5").Pass();
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ(test_file_md5, cache_entry->md5());
 
   // Remove the entry.
-  metadata_->RemoveFromCache(test_resource_id);
+  metadata_->RemoveCacheEntry(test_resource_id);
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
   EXPECT_FALSE(cache_entry.get());
 
   // Add another one.
   test_resource_id = "test_resource_id_2";
   test_file_md5 = "test_file_md5_4";
   test_sub_dir_type = GDataCache::CACHE_TYPE_TMP;
   test_cache_state = CACHE_STATE_PRESENT;
-  metadata_->UpdateCache(
+  metadata_->AddOrUpdateCacheEntry(
       test_resource_id,
       GDataCacheEntry(test_file_md5, test_cache_state));
 
   // Make sure the values took.
   cache_entry =
       metadata_->GetCacheEntry(test_resource_id, test_file_md5).Pass();
   ASSERT_TRUE(cache_entry.get());
   EXPECT_EQ(test_file_md5, cache_entry->md5());
   EXPECT_EQ(test_sub_dir_type, GDataCache::GetSubDirectoryType(*cache_entry));
   EXPECT_EQ(test_cache_state, cache_entry->cache_state());
-
-  // Update with CACHE_STATE_NONE should evict the entry.
-  test_file_md5 = "test_file_md5_5";
-  test_sub_dir_type = GDataCache::CACHE_TYPE_TMP;
-  test_cache_state = CACHE_STATE_NONE;
-  metadata_->UpdateCache(
-      test_resource_id,
-      GDataCacheEntry(test_file_md5, test_cache_state));
-
-  cache_entry =
-      metadata_->GetCacheEntry(test_resource_id, std::string()).Pass();
-  EXPECT_FALSE(cache_entry.get());
 }
 
 TEST_F(GDataCacheMetadataMapTest, Initialization) {
   using file_util::PathExists;
   using file_util::IsLink;
   SetUpCacheWithVariousFiles();
 
   // Some files are removed during cache initialization. Make sure these
   // exist beforehand.
   EXPECT_TRUE(PathExists(persistent_directory_.AppendASCII("id_baz.local")));
@@ skipping 125 matching lines @@
   metadata_->cache_map_ = cache_map;
   metadata_->RemoveTemporaryFiles();
   // resource 1 and 4 should be gone, as these are temporary.
   EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_1>", "").get());
   EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_2>", "").get());
   EXPECT_TRUE(metadata_->GetCacheEntry("<resource_id_3>", "").get());
   EXPECT_FALSE(metadata_->GetCacheEntry("<resource_id_4>", "").get());
 }
 
 }  // namespace gdata