Index: chrome/browser/chromeos/gdata/gdata_cache_metadata.cc |
diff --git a/chrome/browser/chromeos/gdata/gdata_cache_metadata.cc b/chrome/browser/chromeos/gdata/gdata_cache_metadata.cc |
index bd1527bce99adaa9c340788ff2462f9a7d1041ce..22023875aa721737ea00c864e21f8a1dc43198df 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_cache_metadata.cc |
+++ b/chrome/browser/chromeos/gdata/gdata_cache_metadata.cc |
@@ -183,30 +183,29 @@ void GDataCacheMetadataMap::Initialize( |
DVLOG(1) << "Directory scan finished"; |
} |
-void GDataCacheMetadataMap::UpdateCache(const std::string& resource_id, |
- const std::string& md5, |
- int cache_state) { |
+void GDataCacheMetadataMap::UpdateCache( |
+ const std::string& resource_id, |
+ const GDataCache::CacheEntry& 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_state != GDataCache::CACHE_STATE_NONE); |
- if (cache_state != GDataCache::CACHE_STATE_NONE) { |
- GDataCache::CacheEntry cache_entry(md5, cache_state); |
+ DCHECK(cache_entry.cache_state != GDataCache::CACHE_STATE_NONE); |
+ if (cache_entry.cache_state != GDataCache::CACHE_STATE_NONE) { |
cache_map_.insert(std::make_pair(resource_id, cache_entry)); |
DVLOG(1) << "Added res_id=" << resource_id |
<< ", " << cache_entry.ToString(); |
} |
} else { // Resource exists. |
// If cache state is NONE, delete entry from cache map. |
- if (cache_state == GDataCache::CACHE_STATE_NONE) { |
+ if (cache_entry.cache_state == GDataCache::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.md5 = md5; |
- iter->second.cache_state = cache_state; |
+ iter->second.md5 = cache_entry.md5; |
+ iter->second.cache_state = cache_entry.cache_state; |
DVLOG(1) << "Updated res_id=" << resource_id |
<< ", " << iter->second.ToString(); |
} |