Start requiring DistillerPage for calls to DomDistillerService.

components/dom_distiller/core/dom_distiller_service.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/guid.h"
 #include "base/message_loop/message_loop.h"
 #include "components/dom_distiller/core/distilled_content_store.h"
 #include "components/dom_distiller/core/dom_distiller_store.h"
@@ skipping 20 matching lines @@
     const ArticleEntry& entry,
     const DistilledArticleProto* article_proto,
     bool distillation_succeeded) {
   article_cb.Run(distillation_succeeded);
 }
 
 }  // namespace
 
 DomDistillerService::DomDistillerService(
     scoped_ptr<DomDistillerStoreInterface> store,
-    scoped_ptr<DistillerFactory> distiller_factory)
+    scoped_ptr<DistillerFactory> distiller_factory,
+    scoped_ptr<DistillerPageFactory> distiller_page_factory)
     : store_(store.Pass()),
       content_store_(new InMemoryContentStore()),
-      distiller_factory_(distiller_factory.Pass()) {}
+      distiller_factory_(distiller_factory.Pass()),
+      distiller_page_factory_(distiller_page_factory.Pass()) {
+}
 
 DomDistillerService::~DomDistillerService() {}
 
 syncer::SyncableService* DomDistillerService::GetSyncableService() const {
   return store_->GetSyncableService();
 }
 
+scoped_ptr<DistillerPage> DomDistillerService::CreateDefaultDistillerPage() {
+  return distiller_page_factory_->CreateDistillerPage().Pass();
+}
+
 const std::string DomDistillerService::AddToList(
     const GURL& url,
+    scoped_ptr<DistillerPage> distiller_page,
     const ArticleAvailableCallback& article_cb) {
   ArticleEntry entry;
   const bool is_already_added = store_->GetEntryByUrl(url, &entry);
 
   TaskTracker* task_tracker;
   if (is_already_added) {
     task_tracker = GetTaskTrackerForEntry(entry);
     if (task_tracker == NULL) {
       // Entry is in the store but there is no task tracker. This could
       // happen when distillation has already completed. For now just return
@@ skipping 10 matching lines @@
   }
 
   if (!article_cb.is_null()) {
     task_tracker->AddSaveCallback(
         base::Bind(&RunArticleAvailableCallback, article_cb));
   }
 
   if (!is_already_added) {
     task_tracker->AddSaveCallback(base::Bind(
         &DomDistillerService::AddDistilledPageToList, base::Unretained(this)));
-    task_tracker->StartDistiller(distiller_factory_.get());
+    task_tracker->StartDistiller(distiller_factory_.get(),
+                                 distiller_page.Pass());
     task_tracker->StartBlobFetcher();
   }
 
   return task_tracker->GetEntryId();
 }
 
 std::vector<ArticleEntry> DomDistillerService::GetEntries() const {
   return store_->GetEntries();
 }
 
@@ skipping 11 matching lines @@
   }
 
   if (store_->RemoveEntry(*entry)) {
     return entry.Pass();
   }
   return scoped_ptr<ArticleEntry>();
 }
 
 scoped_ptr<ViewerHandle> DomDistillerService::ViewEntry(
     ViewRequestDelegate* delegate,
+    scoped_ptr<DistillerPage> distiller_page,
     const std::string& entry_id) {
   ArticleEntry entry;
   if (!store_->GetEntryById(entry_id, &entry)) {
     return scoped_ptr<ViewerHandle>();
   }
 
   TaskTracker* task_tracker = GetOrCreateTaskTrackerForEntry(entry);
   scoped_ptr<ViewerHandle> viewer_handle = task_tracker->AddViewer(delegate);
-  task_tracker->StartDistiller(distiller_factory_.get());
+  task_tracker->StartDistiller(distiller_factory_.get(), distiller_page.Pass());
   task_tracker->StartBlobFetcher();
 
   return viewer_handle.Pass();
 }
 
 scoped_ptr<ViewerHandle> DomDistillerService::ViewUrl(
     ViewRequestDelegate* delegate,
+    scoped_ptr<DistillerPage> distiller_page,
     const GURL& url) {
   if (!url.is_valid()) {
     return scoped_ptr<ViewerHandle>();
   }
 
   TaskTracker* task_tracker = GetOrCreateTaskTrackerForUrl(url);
   scoped_ptr<ViewerHandle> viewer_handle = task_tracker->AddViewer(delegate);
-  task_tracker->StartDistiller(distiller_factory_.get());
+  task_tracker->StartDistiller(distiller_factory_.get(), distiller_page.Pass());
   task_tracker->StartBlobFetcher();
 
   return viewer_handle.Pass();
 }
 
 TaskTracker* DomDistillerService::GetOrCreateTaskTrackerForUrl(
     const GURL& url) {
   ArticleEntry entry;
   if (store_->GetEntryByUrl(url, &entry)) {
     return GetOrCreateTaskTrackerForEntry(entry);
@@ skipping 64 matching lines @@
   DCHECK(observer);
   store_->AddObserver(observer);
 }
 
 void DomDistillerService::RemoveObserver(DomDistillerObserver* observer) {
   DCHECK(observer);
   store_->RemoveObserver(observer);
 }
 
 }  // namespace dom_distiller