gdata: Take GDataCache::CacheEntry as parameters

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 165 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(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();
     }
   }
 }
 
 void GDataCacheMetadataMap::RemoveFromCache(const std::string& resource_id) {
   AssertOnSequencedWorkerPool();
 
   CacheMap::iterator iter = cache_map_.find(resource_id);
@@ skipping 188 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