Add incremental updates for multipage distillation.

components/dom_distiller/core/dom_distiller_service_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/dom_distiller_service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 15 matching lines @@
 
 namespace dom_distiller {
 namespace test {
 
 namespace {
 
 class FakeViewRequestDelegate : public ViewRequestDelegate {
  public:
   virtual ~FakeViewRequestDelegate() {}
   MOCK_METHOD1(OnArticleReady, void(const DistilledArticleProto* proto));
+  MOCK_METHOD1(OnArticleUpdated,
+               void(ArticleDistillationUpdate article_update));
 };
 
 class MockDistillerObserver : public DomDistillerObserver {
  public:
   MOCK_METHOD1(ArticleEntriesUpdated, void(const std::vector<ArticleUpdate>&));
   virtual ~MockDistillerObserver() {}
 };
 
 class MockArticleAvailableCallback {
  public:
@@ skipping 67 matching lines @@
   ArticleEntry entry;
   entry.set_entry_id(entry_id);
   entry.add_pages()->set_url(url.spec());
 
   store_->AddEntry(entry);
 
   FakeViewRequestDelegate viewer_delegate;
   scoped_ptr<ViewerHandle> handle =
       service_->ViewEntry(&viewer_delegate, entry_id);
 
-  ASSERT_FALSE(distiller->GetCallback().is_null());
+  ASSERT_FALSE(distiller->GetArticleCallback().is_null());
 
   scoped_ptr<DistilledArticleProto> proto = CreateDefaultArticle();
   EXPECT_CALL(viewer_delegate, OnArticleReady(proto.get()));
 
   RunDistillerCallback(distiller, proto.Pass());
 }
 
 TEST_F(DomDistillerServiceTest, TestViewUrl) {
   FakeDistiller* distiller = new FakeDistiller(false);
   EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
       .WillOnce(Return(distiller));
 
   FakeViewRequestDelegate viewer_delegate;
   GURL url("http://www.example.com/p1");
   scoped_ptr<ViewerHandle> handle = service_->ViewUrl(&viewer_delegate, url);
 
-  ASSERT_FALSE(distiller->GetCallback().is_null());
+  ASSERT_FALSE(distiller->GetArticleCallback().is_null());
   EXPECT_EQ(url, distiller->GetUrl());
 
   scoped_ptr<DistilledArticleProto> proto = CreateDefaultArticle();
   EXPECT_CALL(viewer_delegate, OnArticleReady(proto.get()));
 
   RunDistillerCallback(distiller, proto.Pass());
 }
 
 TEST_F(DomDistillerServiceTest, TestMultipleViewUrl) {
   FakeDistiller* distiller = new FakeDistiller(false);
   FakeDistiller* distiller2 = new FakeDistiller(false);
   EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
       .WillOnce(Return(distiller))
       .WillOnce(Return(distiller2));
 
   FakeViewRequestDelegate viewer_delegate;
   FakeViewRequestDelegate viewer_delegate2;
 
   GURL url("http://www.example.com/p1");
   GURL url2("http://www.example.com/a/p1");
 
   scoped_ptr<ViewerHandle> handle = service_->ViewUrl(&viewer_delegate, url);
   scoped_ptr<ViewerHandle> handle2 = service_->ViewUrl(&viewer_delegate2, url2);
 
-  ASSERT_FALSE(distiller->GetCallback().is_null());
+  ASSERT_FALSE(distiller->GetArticleCallback().is_null());
   EXPECT_EQ(url, distiller->GetUrl());
 
   scoped_ptr<DistilledArticleProto> proto = CreateDefaultArticle();
   EXPECT_CALL(viewer_delegate, OnArticleReady(proto.get()));
 
   RunDistillerCallback(distiller, proto.Pass());
 
-  ASSERT_FALSE(distiller2->GetCallback().is_null());
+  ASSERT_FALSE(distiller2->GetArticleCallback().is_null());
   EXPECT_EQ(url2, distiller2->GetUrl());
 
   scoped_ptr<DistilledArticleProto> proto2 = CreateDefaultArticle();
   EXPECT_CALL(viewer_delegate2, OnArticleReady(proto2.get()));
 
   RunDistillerCallback(distiller2, proto2.Pass());
 }
 
 TEST_F(DomDistillerServiceTest, TestViewUrlCancelled) {
   FakeDistiller* distiller = new FakeDistiller(false);
   EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
       .WillOnce(Return(distiller));
 
   bool distiller_destroyed = false;
   EXPECT_CALL(*distiller, Die())
       .WillOnce(testing::Assign(&distiller_destroyed, true));
 
   FakeViewRequestDelegate viewer_delegate;
   GURL url("http://www.example.com/p1");
   scoped_ptr<ViewerHandle> handle = service_->ViewUrl(&viewer_delegate, url);
 
-  ASSERT_FALSE(distiller->GetCallback().is_null());
+  ASSERT_FALSE(distiller->GetArticleCallback().is_null());
   EXPECT_EQ(url, distiller->GetUrl());
 
   EXPECT_CALL(viewer_delegate, OnArticleReady(_)).Times(0);
 
   EXPECT_FALSE(distiller_destroyed);
 
   handle.reset();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(distiller_destroyed);
 }
@@ skipping 21 matching lines @@
   EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
       .WillOnce(Return(distiller));
 
   GURL url("http://www.example.com/p1");
 
   MockArticleAvailableCallback article_cb;
   EXPECT_CALL(article_cb, DistillationCompleted(true));
 
   std::string entry_id = service_->AddToList(url, ArticleCallback(&article_cb));
 
-  ASSERT_FALSE(distiller->GetCallback().is_null());
+  ASSERT_FALSE(distiller->GetArticleCallback().is_null());
   EXPECT_EQ(url, distiller->GetUrl());
 
   scoped_ptr<DistilledArticleProto> proto = CreateArticleWithURL(url.spec());
   RunDistillerCallback(distiller, proto.Pass());
 
   ArticleEntry entry;
   EXPECT_TRUE(store_->GetEntryByUrl(url, &entry));
   EXPECT_EQ(entry.entry_id(), entry_id);
   EXPECT_EQ(1u, store_->GetEntries().size());
   service_->RemoveEntry(entry_id);
@@ skipping 134 matching lines @@
     pages_url[page_num] = GURL(base_url + base::IntToString(page_num));
   }
 
   MockArticleAvailableCallback article_cb;
   EXPECT_CALL(article_cb, DistillationCompleted(true));
 
   std::string entry_id =
       service_->AddToList(pages_url[0], ArticleCallback(&article_cb));
 
   ArticleEntry entry;
-  ASSERT_FALSE(distiller->GetCallback().is_null());
+  ASSERT_FALSE(distiller->GetArticleCallback().is_null());
   EXPECT_EQ(pages_url[0], distiller->GetUrl());
 
   // Create the article with pages to pass to the distiller.
   scoped_ptr<DistilledArticleProto> proto =
       CreateArticleWithURL(pages_url[0].spec());
   for (int page_num = 1; page_num < kPageCount; ++page_num) {
     DistilledPageProto* distilled_page = proto->add_pages();
     distilled_page->set_url(pages_url[page_num].spec());
   }
 
@@ skipping 14 matching lines @@
     EXPECT_TRUE(store_->GetEntryByUrl(pages_url[page_num], &entry));
   }
 
   service_->RemoveEntry(entry_id);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0u, store_->GetEntries().size());
 }
 
 }  // namespace test
 }  // namespace dom_distiller