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

chrome/browser/chromeos/gdata/gdata_cache_metadata.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 "chrome/browser/chromeos/gdata/gdata_util.h"
 
 namespace gdata {
@@ skipping 156 matching lines @@
                      GDataCache::CACHE_TYPE_OUTGOING,
                      &cache_map_,
                      &outgoing_file_map);
 
   RemoveInvalidFilesFromPersistentDirectory(persistent_file_map,
                                             outgoing_file_map,
                                             &cache_map_);
   DVLOG(1) << "Directory scan finished";
 }
 
-void GDataCacheMetadataMap::UpdateCache(
+void GDataCacheMetadataMap::AddOrUpdateCacheEntry(
     const std::string& resource_id,
     const GDataCacheEntry& cache_entry) {
   AssertOnSequencedWorkerPool();
 
   CacheMap::iterator iter = cache_map_.find(resource_id);
   if (iter == cache_map_.end()) {  // New resource, create new entry.
-    // Makes no sense to create new entry if cache state is NONE.
-    DCHECK(cache_entry.cache_state() != CACHE_STATE_NONE);
-    if (cache_entry.cache_state() != CACHE_STATE_NONE) {
-      cache_map_.insert(std::make_pair(resource_id, cache_entry));
-      DVLOG(1) << "Added res_id=" << resource_id
-               << ", " << cache_entry.ToString();
-    }
+    cache_map_.insert(std::make_pair(resource_id, cache_entry));
+    DVLOG(1) << "Added resource_id=" << resource_id
+             << ", " << cache_entry.ToString();
   } else {  // Resource exists.

[hshi1, 2012/07/12 00:27:48]

Can you DCHECK here to make sure the cache state is not CACHE_STATE_NONE?

[satorux1, 2012/07/12 00:35:31]

CACHE_STATE_NONE will be gone, once we change the representation from a bitmask
to a set of bools.

In theory, we could write a function that checks if all bools are false, but
it's probably not worth doing it.

-    // If cache state is NONE, delete entry from cache map.
-    if (cache_entry.cache_state() == CACHE_STATE_NONE) {
-      DVLOG(1) << "Deleting res_id=" << resource_id
-               << ", " << iter->second.ToString();
-      cache_map_.erase(iter);
-    } else {  // Otherwise, update entry in cache map.
-      iter->second.set_md5(cache_entry.md5());
-      iter->second.set_cache_state(cache_entry.cache_state());
-      DVLOG(1) << "Updated res_id=" << resource_id
-               << ", " << iter->second.ToString();
-    }
+    iter->second.set_md5(cache_entry.md5());
+    iter->second.set_cache_state(cache_entry.cache_state());
+    DVLOG(1) << "Updated resource_id=" << resource_id
+             << ", " << iter->second.ToString();
   }
 }
 
-void GDataCacheMetadataMap::RemoveFromCache(const std::string& resource_id) {
+void GDataCacheMetadataMap::RemoveCacheEntry(const std::string& resource_id) {
   AssertOnSequencedWorkerPool();
 
   CacheMap::iterator iter = cache_map_.find(resource_id);
   if (iter != cache_map_.end()) {
     // Delete the CacheEntry and remove it from the map.
     cache_map_.erase(iter);
   }
 }
 
 scoped_ptr<GDataCacheEntry> GDataCacheMetadataMap::GetCacheEntry(
@@ skipping 179 matching lines @@
     // If the MD5 matching is not requested, don't check MD5.
     return true;
   } else if (md5 == cache_entry.md5()) {
     // Otherwise, compare the MD5.
     return true;
   }
   return false;
 }
 
 }  // namespace gdata