Start requiring DistillerPage for calls to DomDistillerService.

components/dom_distiller/core/distiller.h

 // 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.
 
 #ifndef COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_
 #define COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 23 matching lines @@
 
   virtual ~Distiller() {}
 
   // Distills a page, and asynchronously returns the article HTML to the
   // supplied |finished_cb| callback. |update_cb| is invoked whenever article
   // under distillation is updated with more data.
   // E.g. when distilling a 2 page article, |update_cb| may be invoked each time
   // 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;
 };
 
 class DistillerFactory {
  public:
   virtual scoped_ptr<Distiller> CreateDistiller() = 0;
   virtual ~DistillerFactory() {}
 };
 
 // Factory for creating a Distiller.
 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_;
 };
 
 // Distills a article from a page and associated pages.
 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);
 
  private:
   // In case of multiple pages, the Distiller maintains state of multiple pages
   // as page numbers relative to the page number where distillation started.
   // E.g. if distillation starts at page 2 for a 3 page article. The relative
   // page numbers assigned to pages will be [-1,0,1].
 
   // Class representing the state of a page under distillation.
@@ skipping 89 matching lines @@
   bool destruction_allowed_;
 
   base::WeakPtrFactory<DistillerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DistillerImpl);
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_