[dom_distiller] Add support for lookup by URL for InMemoryContentStore.

components/dom_distiller/core/distilled_content_store.h

 // Copyright 2014 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 COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_CONTENT_STORE_H_
 #define COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_CONTENT_STORE_H_
 
 #include <string>
 
 #include "base/bind.h"
+#include "base/containers/hash_tables.h"
 #include "base/containers/mru_cache.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 
 namespace dom_distiller {
 
 // The maximum number of items to keep in the cache before deleting some.
 const int kDefaultMaxNumCachedEntries = 32;
 
 // This is a simple interface for saving and loading of distilled content for an
@@ skipping 12 matching lines @@
 
   DistilledContentStore() {};
   virtual ~DistilledContentStore() {};
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DistilledContentStore);
 };
 
 // This content store keeps up to |max_num_entries| of the last accessed items
 // in its cache. Both loading and saving content is counted as access.
+// Lookup can be done based on entry ID or URL.
 class InMemoryContentStore : public DistilledContentStore {
  public:
   explicit InMemoryContentStore(const int max_num_entries);
   virtual ~InMemoryContentStore();
 
   // DistilledContentStore implementation
   virtual void SaveContent(const ArticleEntry& entry,
                            const DistilledArticleProto& proto,
                            SaveCallback callback) OVERRIDE;
   virtual void LoadContent(const ArticleEntry& entry,
                            LoadCallback callback) OVERRIDE;
 
   // Synchronously saves the content.
   void InjectContent(const ArticleEntry& entry,
                      const DistilledArticleProto& proto);
 
  private:
-  typedef base::MRUCache<std::string, DistilledArticleProto> ContentMap;
+  // The CacheDeletor gets called when anything is removed from the ContentMap.
+  class CacheDeletor {
+   public:
+    explicit CacheDeletor(InMemoryContentStore* store);
+    ~CacheDeletor();
+    void operator()(const DistilledArticleProto& proto);
+
+   private:
+    InMemoryContentStore* store_;
+  };
+
+  void AddUrlToIdMapping(const ArticleEntry& entry,
+                         const DistilledArticleProto& proto);
+
+  void EraseUrlToIdMapping(const DistilledArticleProto& proto);
+
+  typedef base::MRUCacheBase<std::string,
+                             DistilledArticleProto,
+                             InMemoryContentStore::CacheDeletor> ContentMap;
+  typedef base::hash_map<std::string, std::string> URLMap;

[cjhopman, 2014/06/06 17:33:05]

s/URLMap/UrlMap

[nyquist, 2014/06/06 19:00:21]

Done.

+
   ContentMap cache_;
+  URLMap url_to_id_;
 };
+
 }  // dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_CONTENT_CACHE_H_