Add support for displaying distilled articles.

chrome/browser/dom_distiller/dom_distiller_service_factory.cc

Index: chrome/browser/dom_distiller/dom_distiller_service_factory.cc
diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
index 4d248d238d7133a866323384f7cb82f9e0b96fe7..679e9141a4a5dd59c65ef47702964202291b5a57 100644
--- a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
+++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
@@ -44,12 +44,9 @@ DomDistillerServiceFactory::~DomDistillerServiceFactory() {}
 
 BrowserContextKeyedService* DomDistillerServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
-  content::URLDataSource::Add(
-      profile, new DomDistillerViewerSource(chrome::kDomDistillerScheme));
-
   scoped_refptr<base::SequencedTaskRunner> background_task_runner =
-          content::BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
-              content::BrowserThread::GetBlockingPool()->GetSequenceToken());
+      content::BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
+          content::BrowserThread::GetBlockingPool()->GetSequenceToken());
 
   scoped_ptr<DomDistillerDatabase> db(
       new DomDistillerDatabase(background_task_runner));
@@ -57,21 +54,27 @@ BrowserContextKeyedService* DomDistillerServiceFactory::BuildServiceInstanceFor(
   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<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()));
-  return new DomDistillerContextKeyedService(
-      dom_distiller_store.PassAs<DomDistillerStoreInterface>(),
-            distiller_factory.Pass());
+  scoped_ptr<DistillerFactory> distiller_factory(new DistillerFactoryImpl(
+      distiller_page_factory.Pass(), distiller_url_fetcher_factory.Pass()));
+
+  DomDistillerContextKeyedService* service =
+      new DomDistillerContextKeyedService(
+          dom_distiller_store.PassAs<DomDistillerStoreInterface>(),
+          distiller_factory.Pass());
+
+  // Set up URL data source for the chrome-distiller:// scheme.
+  content::URLDataSource::Add(
+      profile,
+      new DomDistillerViewerSource(service, chrome::kDomDistillerScheme));
 
+  return service;
 }
 
 content::BrowserContext* DomDistillerServiceFactory::GetBrowserContextToUse(