gdata: Make GDataCache::CacheEntry a struct

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 164 matching lines @@
 }
 
 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_entry.cache_state != GDataCache::CACHE_STATE_NONE);
-    if (cache_entry.cache_state != GDataCache::CACHE_STATE_NONE) {
+    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_entry.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 = cache_entry.md5;
-      iter->second.cache_state = cache_entry.cache_state;
+      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();
     }
   }
 }
 
 void GDataCacheMetadataMap::RemoveFromCache(const std::string& resource_id) {
   AssertOnSequencedWorkerPool();
 
   CacheMap::iterator iter = cache_map_.find(resource_id);
@@ skipping 169 matching lines @@
 }
 
 // static
 bool GDataCacheMetadataMap::CheckIfMd5Matches(
     const std::string& md5,
     const GDataCache::CacheEntry& cache_entry) {
   if (cache_entry.IsDirty()) {
     // If the entry is dirty, its MD5 may have been replaced by "local"
     // during cache initialization, so we don't compare MD5.
     return true;
-  } else if (cache_entry.IsPinned() && cache_entry.md5.empty()) {
+  } else if (cache_entry.IsPinned() && cache_entry.md5().empty()) {
     // If the entry is pinned, it's ok for the entry to have an empty
     // MD5. This can happen if the pinned file is not fetched. MD5 for pinned
     // files are collected from files in "persistent" directory, but the
     // persistent files do not exisit if these are not fetched yet.
     return true;
   } else if (md5.empty()) {
     // If the MD5 matching is not requested, don't check MD5.
     return true;
-  } else if (md5 == cache_entry.md5) {
+  } else if (md5 == cache_entry.md5()) {
     // Otherwise, compare the MD5.
     return true;
   }
   return false;
 }
 
 }  // namespace gdata