Start requiring DistillerPage for calls to DomDistillerService.

components/dom_distiller/core/distiller.h

Index: components/dom_distiller/core/distiller.h
diff --git a/components/dom_distiller/core/distiller.h b/components/dom_distiller/core/distiller.h
index 8196757d959a029d7b9d70802724adf58e41de77..9e0eb8405c90ab8cd0fbf737624d31742560a2de 100644
--- a/components/dom_distiller/core/distiller.h
+++ b/components/dom_distiller/core/distiller.h
@@ -41,6 +41,7 @@ class Distiller {
   // a distilled page is added and |finished_cb| will be invoked once
   // distillation is completed.
   virtual void DistillPage(const GURL& url,
+                           scoped_ptr<DistillerPage> distiller_page,
                            const DistillationFinishedCallback& finished_cb,
                            const DistillationUpdateCallback& update_cb) = 0;
 };
@@ -55,13 +56,11 @@ class DistillerFactory {
 class DistillerFactoryImpl : public DistillerFactory {
  public:
   DistillerFactoryImpl(
-      scoped_ptr<DistillerPageFactory> distiller_page_factory,
       scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory);
   virtual ~DistillerFactoryImpl();
   virtual scoped_ptr<Distiller> CreateDistiller() OVERRIDE;
 
  private:
-  scoped_ptr<DistillerPageFactory> distiller_page_factory_;
   scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory_;
 };
 
@@ -69,14 +68,14 @@ class DistillerFactoryImpl : public DistillerFactory {
 class DistillerImpl : public Distiller {
  public:
   DistillerImpl(
-      const DistillerPageFactory& distiller_page_factory,
       const DistillerURLFetcherFactory& distiller_url_fetcher_factory);
   virtual ~DistillerImpl();
 
-  virtual void DistillPage(const GURL& url,
-                           const DistillationFinishedCallback& finished_cb,
-                           const DistillationUpdateCallback& update_cb)
-      OVERRIDE;
+  virtual void DistillPage(
+      const GURL& url,
+      scoped_ptr<DistillerPage> distiller_page,
+      const DistillationFinishedCallback& finished_cb,
+      const DistillationUpdateCallback& update_cb) OVERRIDE;
 
   void SetMaxNumPagesInArticle(size_t max_num_pages);