Start requiring DistillerPage for calls to DomDistillerService.

components/dom_distiller/core/distiller.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/distiller.h"
 
 #include <map>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 11 matching lines @@
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
 // Maximum number of distilled pages in an article.
 const size_t kMaxPagesInArticle = 32;
 }
 
 namespace dom_distiller {
 
 DistillerFactoryImpl::DistillerFactoryImpl(
-    scoped_ptr<DistillerPageFactory> distiller_page_factory,
     scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory)
-  : distiller_page_factory_(distiller_page_factory.Pass()),
-    distiller_url_fetcher_factory_(distiller_url_fetcher_factory.Pass()) {}
+    : distiller_url_fetcher_factory_(distiller_url_fetcher_factory.Pass()) {
+}
 
 DistillerFactoryImpl::~DistillerFactoryImpl() {}
 
 scoped_ptr<Distiller> DistillerFactoryImpl::CreateDistiller() {
-  scoped_ptr<DistillerImpl> distiller(new DistillerImpl(
-      *distiller_page_factory_, *distiller_url_fetcher_factory_));
+  scoped_ptr<DistillerImpl> distiller(
+      new DistillerImpl(*distiller_url_fetcher_factory_));
   return distiller.PassAs<Distiller>();
 }
 
 DistillerImpl::DistilledPageData::DistilledPageData() {}
 
 DistillerImpl::DistilledPageData::~DistilledPageData() {}
 
 DistillerImpl::DistillerImpl(
-    const DistillerPageFactory& distiller_page_factory,
     const DistillerURLFetcherFactory& distiller_url_fetcher_factory)
     : distiller_url_fetcher_factory_(distiller_url_fetcher_factory),
       max_pages_in_article_(kMaxPagesInArticle),
       destruction_allowed_(true),
       weak_factory_(this) {
-  distiller_page_ = distiller_page_factory.CreateDistillerPage().Pass();
 }
 
 DistillerImpl::~DistillerImpl() {
   DCHECK(destruction_allowed_);
 }
 
 void DistillerImpl::SetMaxNumPagesInArticle(size_t max_num_pages) {
   max_pages_in_article_ = max_num_pages;
 }
 
@@ skipping 22 matching lines @@
 
 DistillerImpl::DistilledPageData* DistillerImpl::GetPageAtIndex(size_t index)
     const {
   DCHECK_LT(index, pages_.size());
   DistilledPageData* page_data = pages_[index];
   DCHECK(page_data);
   return page_data;
 }
 
 void DistillerImpl::DistillPage(const GURL& url,
+                                scoped_ptr<DistillerPage> distiller_page,
                                 const DistillationFinishedCallback& finished_cb,
                                 const DistillationUpdateCallback& update_cb) {
   DCHECK(AreAllPagesFinished());
+  distiller_page_ = distiller_page.Pass();
   finished_cb_ = finished_cb;
   update_cb_ = update_cb;
 
   AddToDistillationQueue(0, url);
   DistillNextPage();
 }
 
 void DistillerImpl::DistillNextPage() {
   if (!waiting_pages_.empty()) {
     std::map<int, GURL>::iterator front = waiting_pages_.begin();
@@ skipping 170 matching lines @@
     DCHECK(finished_pages_index_.empty());
 
     base::AutoReset<bool> dont_delete_this_in_callback(&destruction_allowed_,
                                                        false);
     finished_cb_.Run(article_proto.Pass());
     finished_cb_.Reset();
   }
 }
 
 }  // namespace dom_distiller