Start requiring DistillerPage for calls to DomDistillerService.

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 134 matching lines @@
   TestCancelCallback cancel_callback;
   TaskTracker task_tracker(
       GetDefaultEntry(), cancel_callback.GetCallback(), NULL);
 
   FakeViewRequestDelegate viewer_delegate;
   scoped_ptr<ViewerHandle> handle(task_tracker.AddViewer(&viewer_delegate));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(viewer_delegate, OnArticleReady(_));
 
-  task_tracker.StartDistiller(&distiller_factory);
+  task_tracker.StartDistiller(&distiller_factory,
+                              scoped_ptr<DistillerPage>().Pass());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_FALSE(cancel_callback.Cancelled());
 }
 
 TEST_F(DomDistillerTaskTrackerTest,
        TestSaveCallbackCalledOnDistillationComplete) {
   MockDistillerFactory distiller_factory;
   FakeDistiller* distiller = new FakeDistiller(true);
   EXPECT_CALL(distiller_factory, CreateDistillerImpl())
       .WillOnce(Return(distiller));
   TestCancelCallback cancel_callback;
   TaskTracker task_tracker(
       GetDefaultEntry(), cancel_callback.GetCallback(), NULL);
 
   MockSaveCallback save_callback;
   task_tracker.AddSaveCallback(
       base::Bind(&MockSaveCallback::Save, base::Unretained(&save_callback)));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(save_callback, Save(_, _, _));
 
-  task_tracker.StartDistiller(&distiller_factory);
+  task_tracker.StartDistiller(&distiller_factory,
+                              scoped_ptr<DistillerPage>().Pass());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(cancel_callback.Cancelled());
 }
 
 DistilledArticleProto CreateDistilledArticleForEntry(
     const ArticleEntry& entry) {
   DistilledArticleProto article;
   for (int i = 0; i < entry.pages_size(); ++i) {
     DistilledPageProto* page = article.add_pages();
@@ skipping 52 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   DistilledArticleProto distilled_article;
 
   EXPECT_CALL(viewer_delegate, OnArticleReady(_))
       .WillOnce(testing::SaveArgPointee<0>(&distilled_article));
   bool distiller_destroyed = false;
   EXPECT_CALL(*distiller, Die())
       .WillOnce(testing::Assign(&distiller_destroyed, true));
 
-  task_tracker.StartDistiller(&distiller_factory);
+  task_tracker.StartDistiller(&distiller_factory,
+                              scoped_ptr<DistillerPage>().Pass());
   task_tracker.StartBlobFetcher();
   base::RunLoop().RunUntilIdle();
 
   testing::Mock::VerifyAndClearExpectations(&viewer_delegate);
   EXPECT_EQ(stored_distilled_article.SerializeAsString(),
             distilled_article.SerializeAsString());
 
   EXPECT_TRUE(distiller_destroyed);
   EXPECT_FALSE(cancel_callback.Cancelled());
   base::RunLoop().RunUntilIdle();
@@ skipping 12 matching lines @@
 
   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();
 
   task_tracker.StartBlobFetcher();
-  task_tracker.StartDistiller(&distiller_factory);
+  task_tracker.StartDistiller(&distiller_factory,
+                              scoped_ptr<DistillerPage>().Pass());
 
   // OnArticleReady shouldn't be called until distillation finishes (i.e. the
   // blob fetcher shouldn't return distilled content).
   EXPECT_CALL(viewer_delegate, OnArticleReady(_)).Times(0);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(viewer_delegate, OnArticleReady(_));
   distiller->RunDistillerCallback(distilled_article.Pass());
   base::RunLoop().RunUntilIdle();
 
@@ skipping 10 matching lines @@
   MockContentStore content_store;
 
   TestCancelCallback cancel_callback;
   TaskTracker task_tracker(
       GetDefaultEntry(), cancel_callback.GetCallback(), &content_store);
 
   FakeViewRequestDelegate viewer_delegate;
   scoped_ptr<ViewerHandle> handle(task_tracker.AddViewer(&viewer_delegate));
 
   DistilledContentStore::LoadCallback content_store_load_callback;
-  EXPECT_CALL(content_store, LoadContent(_, _)).WillOnce(
-      testing::SaveArg<1>(&content_store_load_callback));
+  EXPECT_CALL(content_store, LoadContent(_, _))
+      .WillOnce(testing::SaveArg<1>(&content_store_load_callback));
 
-  task_tracker.StartDistiller(&distiller_factory);
+  task_tracker.StartDistiller(&distiller_factory,
+                              scoped_ptr<DistillerPage>().Pass());
   task_tracker.StartBlobFetcher();
 
   EXPECT_CALL(viewer_delegate, OnArticleReady(_)).Times(0);
   distiller->RunDistillerCallback(
       scoped_ptr<DistilledArticleProto>(new DistilledArticleProto));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(viewer_delegate, OnArticleReady(_));
   content_store_load_callback.Run(
       true,
@@ skipping 20 matching lines @@
       GetDefaultEntry(), cancel_callback.GetCallback(), &content_store);
 
   FakeViewRequestDelegate viewer_delegate;
   scoped_ptr<ViewerHandle> handle(task_tracker.AddViewer(&viewer_delegate));
 
   DistilledArticleProto stored_distilled_article;
   DistilledContentStore::LoadCallback content_store_load_callback;
   EXPECT_CALL(content_store, SaveContent(_, _, _))
       .WillOnce(testing::SaveArg<1>(&stored_distilled_article));
 
-  task_tracker.StartDistiller(&distiller_factory);
+  task_tracker.StartDistiller(&distiller_factory,
+                              scoped_ptr<DistillerPage>().Pass());
 
   EXPECT_CALL(viewer_delegate, OnArticleReady(_));
   distiller->RunDistillerCallback(scoped_ptr<DistilledArticleProto>(
       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