Change InMemoryContentStore to use MRUCache.

components/dom_distiller/core/task_tracker_unittest.cc

 // Copyright 2013 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/task_tracker.h"
 
 #include "base/run_loop.h"
 #include "components/dom_distiller/core/article_distillation_update.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/distilled_content_store.h"
@@ skipping 10 matching lines @@
  public:
   virtual ~FakeViewRequestDelegate() {}
   MOCK_METHOD1(OnArticleReady,
                void(const DistilledArticleProto* article_proto));
   MOCK_METHOD1(OnArticleUpdated,
                void(ArticleDistillationUpdate article_update));
 };
 
 class MockContentStore : public DistilledContentStore {
  public:
-  MOCK_CONST_METHOD2(LoadContent,
-                     void(const ArticleEntry& entry, LoadCallback callback));
+  MOCK_METHOD2(LoadContent,
+               void(const ArticleEntry& entry, LoadCallback callback));
   MOCK_METHOD3(SaveContent,
                void(const ArticleEntry& entry,
                     const DistilledArticleProto& proto,
                     SaveCallback callback));
 };
 
 class TestCancelCallback {
  public:
   TestCancelCallback() : cancelled_(false) {}
   TaskTracker::CancelCallback GetCallback() {
@@ skipping 148 matching lines @@
     page->set_url(entry.pages(i).url());
     page->set_html("<div>" + entry.pages(i).url() + "</div>");
   }
   return article;
 }
 
 TEST_F(DomDistillerTaskTrackerTest, TestBlobFetcher) {
   ArticleEntry entry_with_blob = GetDefaultEntry();
   DistilledArticleProto stored_distilled_article =
       CreateDistilledArticleForEntry(entry_with_blob);
-  InMemoryContentStore content_store;
+  InMemoryContentStore content_store(kDefaultMaxNumCachedEntries);
   content_store.InjectContent(entry_with_blob, stored_distilled_article);
   TestCancelCallback cancel_callback;
 
   TaskTracker task_tracker(
       entry_with_blob, cancel_callback.GetCallback(), &content_store);
 
   FakeViewRequestDelegate viewer_delegate;
   scoped_ptr<ViewerHandle> handle(task_tracker.AddViewer(&viewer_delegate));
   base::RunLoop().RunUntilIdle();
 
@@ skipping 13 matching lines @@
 
 TEST_F(DomDistillerTaskTrackerTest, TestBlobFetcherFinishesFirst) {
   MockDistillerFactory distiller_factory;
   FakeDistiller* distiller = new FakeDistiller(false);
   EXPECT_CALL(distiller_factory, CreateDistillerImpl())
       .WillOnce(Return(distiller));
 
   ArticleEntry entry_with_blob = GetDefaultEntry();
   DistilledArticleProto stored_distilled_article =
       CreateDistilledArticleForEntry(entry_with_blob);
-  InMemoryContentStore content_store;
+  InMemoryContentStore content_store(kDefaultMaxNumCachedEntries);
   content_store.InjectContent(entry_with_blob, stored_distilled_article);
   TestCancelCallback cancel_callback;
   TaskTracker task_tracker(
       entry_with_blob, cancel_callback.GetCallback(), &content_store);
 
   FakeViewRequestDelegate viewer_delegate;
   scoped_ptr<ViewerHandle> handle(task_tracker.AddViewer(&viewer_delegate));
   base::RunLoop().RunUntilIdle();
 
   DistilledArticleProto distilled_article;
@@ skipping 18 matching lines @@
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(DomDistillerTaskTrackerTest, TestBlobFetcherWithoutBlob) {
   MockDistillerFactory distiller_factory;
   FakeDistiller* distiller = new FakeDistiller(false);
   EXPECT_CALL(distiller_factory, CreateDistillerImpl())
       .WillOnce(Return(distiller));
 
   ArticleEntry entry(GetDefaultEntry());
-  InMemoryContentStore content_store;
+  InMemoryContentStore content_store(kDefaultMaxNumCachedEntries);
   scoped_ptr<DistilledArticleProto> distilled_article(
       new DistilledArticleProto(CreateDistilledArticleForEntry(entry)));
 
   TestCancelCallback cancel_callback;
   TaskTracker task_tracker(
       GetDefaultEntry(), cancel_callback.GetCallback(), &content_store);
 
   FakeViewRequestDelegate viewer_delegate;
   scoped_ptr<ViewerHandle> handle(task_tracker.AddViewer(&viewer_delegate));
   base::RunLoop().RunUntilIdle();
@@ skipping 84 matching lines @@
       new DistilledArticleProto(distilled_article)));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(stored_distilled_article.SerializeAsString(),
             distilled_article.SerializeAsString());
   EXPECT_FALSE(cancel_callback.Cancelled());
 }
 
 }  // namespace test
 }  // namespace dom_distiller