Start requiring DistillerPage for calls to DomDistillerService.

chrome/browser/dom_distiller/dom_distiller_service_factory.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 "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/dom_distiller/content/distiller_page_web_contents.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/dom_distiller_store.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace dom_distiller {
 
 DomDistillerContextKeyedService::DomDistillerContextKeyedService(
     scoped_ptr<DomDistillerStoreInterface> store,
-    scoped_ptr<DistillerFactory> distiller_factory)
-    : DomDistillerService(store.Pass(), distiller_factory.Pass()) {}
+    scoped_ptr<DistillerFactory> distiller_factory,
+    scoped_ptr<DistillerPageFactory> distiller_page_factory)
+    : DomDistillerService(store.Pass(),
+                          distiller_factory.Pass(),
+                          distiller_page_factory.Pass()) {
+}
 
 // static
 DomDistillerServiceFactory* DomDistillerServiceFactory::GetInstance() {
   return Singleton<DomDistillerServiceFactory>::get();
 }
 
 // static
 DomDistillerContextKeyedService*
 DomDistillerServiceFactory::GetForBrowserContext(
     content::BrowserContext* context) {
@@ skipping 20 matching lines @@
   base::FilePath database_dir(
       profile->GetPath().Append(FILE_PATH_LITERAL("Articles")));
 
   scoped_ptr<DomDistillerStore> dom_distiller_store(new DomDistillerStore(
       db.PassAs<DomDistillerDatabaseInterface>(), database_dir));
 
   scoped_ptr<DistillerPageFactory> distiller_page_factory(
       new DistillerPageWebContentsFactory(profile));
   scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory(
       new DistillerURLFetcherFactory(profile->GetRequestContext()));
-  scoped_ptr<DistillerFactory> distiller_factory(new DistillerFactoryImpl(
-      distiller_page_factory.Pass(), distiller_url_fetcher_factory.Pass()));
+  scoped_ptr<DistillerFactory> distiller_factory(
+      new DistillerFactoryImpl(distiller_url_fetcher_factory.Pass()));
 
   DomDistillerContextKeyedService* service =
       new DomDistillerContextKeyedService(
           dom_distiller_store.PassAs<DomDistillerStoreInterface>(),
-          distiller_factory.Pass());
+          distiller_factory.Pass(),
+          distiller_page_factory.Pass());
 
   return service;
 }
 
 content::BrowserContext* DomDistillerServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // TODO(cjhopman): Do we want this to be
   // GetBrowserContextRedirectedInIncognito?
   return context;
 }
 
 }  // namespace dom_distiller