Add read support to PNaClTranslationCache

chrome/browser/nacl_host/pnacl_translation_cache.h

Index: chrome/browser/nacl_host/pnacl_translation_cache.h
diff --git a/chrome/browser/nacl_host/pnacl_translation_cache.h b/chrome/browser/nacl_host/pnacl_translation_cache.h
index 23a9917a47de45949628252e29ab8df739b4d409..abcc6b076ff6f6aeae28501c3b978ed9e95cb638 100644
--- a/chrome/browser/nacl_host/pnacl_translation_cache.h
+++ b/chrome/browser/nacl_host/pnacl_translation_cache.h
@@ -22,7 +22,7 @@ class Backend;
 
 namespace pnacl_cache {
 typedef base::Callback<void(int)> CompletionCallback;
-class PNaClTranslationCacheWriteEntry;
+class PNaClTranslationCacheEntry;
 extern const int kMaxMemCacheSize;
 
 class PNaClTranslationCache
@@ -48,19 +48,20 @@ class PNaClTranslationCache
                  const std::string& nexe,
                  const CompletionCallback& callback);
 
-  // Retrieve the nexe from the translation cache. (Not implemented yet.)
-  int GetNexe(const std::string& key,
-              std::string* nexe,
-              const CompletionCallback& callback);
+  // Retrieve the nexe from the translation cache. Write the data into |nexe|
+  // and call |callback| with the result (0 on success and <0 otherwise)
+  void GetNexe(const std::string& key,
+               std::string* nexe,
+               const CompletionCallback& callback);
 
   // Return the number of entries in the cache backend.
   int Size();
 
  private:
-  friend class PNaClTranslationCacheWriteEntry;
-  // PNaClTranslationCacheWriteEntry should only use the
-  // WriteComplete and backend methods on PNaClTranslationCache.
-  void WriteComplete(PNaClTranslationCacheWriteEntry* entry);
+  friend class PNaClTranslationCacheEntry;
+  // PNaClTranslationCacheEntry should only use the
+  // OpComplete and backend methods on PNaClTranslationCache.
+  void OpComplete(PNaClTranslationCacheEntry* entry);
   disk_cache::Backend* backend() { return disk_cache_; }
 
   int InitWithDiskBackend(const base::FilePath& disk_cache_dir,
@@ -79,8 +80,7 @@ class PNaClTranslationCache
   disk_cache::Backend* disk_cache_;
   CompletionCallback init_callback_;
   bool in_memory_;
-  std::map<void*, scoped_refptr<PNaClTranslationCacheWriteEntry> >
-      write_entries_;
+  std::map<void*, scoped_refptr<PNaClTranslationCacheEntry> > write_entries_;

[jvoung (off chromium), 2013/06/05 00:42:28]

Should probably rename this from write_entries to something more generic.

Also though the PNaClTranslationCacheEntry class helps open/create the Entry and
track it, something like inflight ops / pending ops might be a better name?

[Derek Schuff, 2013/06/05 05:01:59]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(PNaClTranslationCache);
 };