gdata: Get rid of GDataFileSystem::GetCacheState()

chrome/browser/chromeos/gdata/gdata_cache.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 104 matching lines @@
   };
 
   // Structure to store information of an existing cache file.
   struct CacheEntry {
     CacheEntry() : sub_dir_type(CACHE_TYPE_META),
                    cache_state(0) {}
 
     CacheEntry(const std::string& md5,
                CacheSubDirectoryType sub_dir_type,
                int cache_state)
-    : md5(md5),
-      sub_dir_type(sub_dir_type),
-      cache_state(cache_state) {
+        : md5(md5),
+          sub_dir_type(sub_dir_type),
+          cache_state(cache_state) {
     }
 
     bool IsPresent() const { return IsCachePresent(cache_state); }
     bool IsPinned() const { return IsCachePinned(cache_state); }
     bool IsDirty() const { return IsCacheDirty(cache_state); }
     bool IsMounted() const  { return IsCacheMounted(cache_state); }
 
     // For debugging purposes.
     std::string ToString() const;
 
     std::string md5;
     CacheSubDirectoryType sub_dir_type;
     int cache_state;
   };
 
+  // Callback for GetCacheEntryOnUIThread.
+  // |success| indicates if the operation was successful.
+  // |cache_entry| is the obtained cache entry.
+  //
+  // TODO(satorux): Unlike other callback types, this has to be defined
+  // inside GDataCache as CacheEntry is inside GDataCache. We should get them
+  // outside of GDataCache.

[hshi1, 2012/06/28 22:11:21]

Maybe gdata_params.h is a good place to define callback types like this?

[satorux1, 2012/06/28 22:41:17]

Well, I plan to get rid of gdata_params.h. Callback types should be defined in
.h file where it's used as parameters...

+  typedef base::Callback<void(bool success, const CacheEntry& cache_entry)>
+      GetCacheEntryCallback;
+
   static bool IsCachePresent(int cache_state) {
     return cache_state & CACHE_STATE_PRESENT;
   }
   static bool IsCachePinned(int cache_state) {
     return cache_state & CACHE_STATE_PINNED;
   }
   static bool IsCacheDirty(int cache_state) {
     return cache_state & CACHE_STATE_DIRTY;
   }
   static bool IsCacheMounted(int cache_state) {
@@ skipping 45 matching lines @@
   bool IsUnderGDataCacheDirectory(const FilePath& path) const;
 
   // Adds observer.
   // Must be called on UI thread.
   void AddObserver(Observer* observer);
 
   // Removes observer.
   // Must be called on UI thread.
   void RemoveObserver(Observer* observer);
 
+  // Gets the cache entry by the given resource ID and MD5.
+  // See also GetCacheEntry().
+  //
+  // Must be called on UI thread. |callback| is run on UI thread.
+  void GetCacheEntryOnUIThread(
+    const std::string& resource_id,
+    const std::string& md5,
+    const GetCacheEntryCallback& callback);
+
   // Gets the resource IDs of pinned-but-not-fetched files and
   // dirty-but-not-uploaded files.
   //
   // Must be called on UI thread. |callback| is run on UI thread.
   void GetResourceIdsOfBacklogOnUIThread(
       const GetResourceIdsCallback& callback);
 
   // Frees up disk space to store the given number of bytes, while keeping
   // kMinFreSpace bytes on the disk, if needed.  |has_enough_space| is
   // updated to indicate if we have enough space.
@@ skipping 193 matching lines @@
                   const std::string& resource_id,
                   const std::string& md5,
                   const CacheOperationCallback& callback);
 
   // Runs callback and notifies the observers when file is committed.
   void OnCommitDirty(base::PlatformFileError* error,
                      const std::string& resource_id,
                      const std::string& md5,
                      const CacheOperationCallback& callback);
 
+  // Helper function to implement GetCacheEntryOnUIThread().
+  void GetCacheEntryHelper(const std::string& resource_id,
+                           const std::string& md5,
+                           bool* success,
+                           GDataCache::CacheEntry* cache_entry);
+
   // The root directory of the cache (i.e. <user_profile_dir>/GCache/v1).
   const FilePath cache_root_path_;
   // Paths for all subdirectories of GCache, one for each
   // GDataCache::CacheSubDirectoryType enum.
   const std::vector<FilePath> cache_paths_;
   base::SequencedWorkerPool* pool_;
   const base::SequencedWorkerPool::SequenceToken sequence_token_;
 
   // The cache state data. This member must be access only on the blocking pool.
   scoped_ptr<GDataCacheMetadata> metadata_;
@@ skipping 25 matching lines @@
 };
 
 // Sets the free disk space getter for testing.
 // The existing getter is deleted.
 void SetFreeDiskSpaceGetterForTesting(
     FreeDiskSpaceGetterInterface* getter);
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_CACHE_H_