base: Remove OwningMRUCache in favor of scoped_ptrs in MRUCache

components/dom_distiller/core/distilled_content_store.cc

 // 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.
 
 #include "components/dom_distiller/core/distilled_content_store.h"
 
 #include "base/thread_task_runner_handle.h"
 
 namespace dom_distiller {
 
 InMemoryContentStore::InMemoryContentStore(const int max_num_entries)
-    : cache_(max_num_entries, CacheDeletor(this)) {
-}
+    : cache_(max_num_entries) {}
 
 InMemoryContentStore::~InMemoryContentStore() {
   // Clear the cache before destruction to ensure the CacheDeletor is not called
   // after InMemoryContentStore has been destroyed.
   cache_.Clear();
 }
 
 void InMemoryContentStore::SaveContent(
     const ArticleEntry& entry,
     const DistilledArticleProto& proto,
@@ skipping 21 matching lines @@
         it = cache_.Get(url_it->second);
         success = it != cache_.end();
         if (success) {
           break;
         }
       }
     }
   }
   scoped_ptr<DistilledArticleProto> distilled_article;
   if (success) {
-    distilled_article.reset(new DistilledArticleProto(it->second));
+    distilled_article.reset(new DistilledArticleProto(*it->second));
   } else {
     distilled_article.reset(new DistilledArticleProto());
   }
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(callback, success, base::Passed(&distilled_article)));
 }
 
 void InMemoryContentStore::InjectContent(const ArticleEntry& entry,
                                          const DistilledArticleProto& proto) {
-  cache_.Put(entry.entry_id(), proto);
+  cache_.Put(entry.entry_id(),
+             scoped_ptr<DistilledArticleProto, CacheDeletor>(
+                 new DistilledArticleProto(proto), CacheDeletor(this)));
   AddUrlToIdMapping(entry, proto);
 }
 
 void InMemoryContentStore::AddUrlToIdMapping(
     const ArticleEntry& entry,
     const DistilledArticleProto& proto) {
   for (int i = 0; i < proto.pages_size(); i++) {
     const DistilledPageProto& page = proto.pages(i);
     if (page.has_url()) {
       url_to_id_[page.url()] = entry.entry_id();
@@ skipping 12 matching lines @@
 }
 
 InMemoryContentStore::CacheDeletor::CacheDeletor(InMemoryContentStore* store)
     : store_(store) {
 }
 
 InMemoryContentStore::CacheDeletor::~CacheDeletor() {
 }
 
 void InMemoryContentStore::CacheDeletor::operator()(
-    const DistilledArticleProto& proto) {
+    DistilledArticleProto* proto) {
   // When InMemoryContentStore is deleted, the |store_| pointer becomes invalid,
   // but since the ContentMap is cleared in the InMemoryContentStore destructor,
   // this should never be called after the destructor.
-  store_->EraseUrlToIdMapping(proto);
+  store_->EraseUrlToIdMapping(*proto);
+  delete proto;
 }
 
 }  // namespace dom_distiller