Save favicon during reading list distillation

ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc

 // Copyright 2015 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 "ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/dom_distiller_store.h"
 #include "components/dom_distiller/ios/distiller_page_factory_ios.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "components/leveldb_proto/proto_database_impl.h"
+#include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
+#include "ios/chrome/browser/dom_distiller/favicon_web_state_dispatcher_impl.h"
+#include "ios/chrome/browser/favicon/favicon_service_factory.h"
+#include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/web_thread.h"
 
 namespace {
 // A simple wrapper for DomDistillerService to expose it as a
 // KeyedService.
-class DomDistillerKeyedService
-    : public KeyedService,
-      public dom_distiller::DomDistillerService {
+class DomDistillerKeyedService : public KeyedService,
+                                 public dom_distiller::DomDistillerService {
  public:
   DomDistillerKeyedService(
       std::unique_ptr<dom_distiller::DomDistillerStoreInterface> store,
       std::unique_ptr<dom_distiller::DistillerFactory> distiller_factory,
       std::unique_ptr<dom_distiller::DistillerPageFactory>
           distiller_page_factory,
       std::unique_ptr<dom_distiller::DistilledPagePrefs> distilled_page_prefs)
       : DomDistillerService(std::move(store),
                             std::move(distiller_factory),
                             std::move(distiller_page_factory),
@@ skipping 17 matching lines @@
 DomDistillerService* DomDistillerServiceFactory::GetForBrowserState(
     ios::ChromeBrowserState* browser_state) {
   return static_cast<DomDistillerKeyedService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
 
 DomDistillerServiceFactory::DomDistillerServiceFactory()
     : BrowserStateKeyedServiceFactory(
           "DomDistillerService",
           BrowserStateDependencyManager::GetInstance()) {
+  DependsOn(ios::FaviconServiceFactory::GetInstance());
+  DependsOn(ios::HistoryServiceFactory::GetInstance());
+  DependsOn(ios::BookmarkModelFactory::GetInstance());
 }
 
-DomDistillerServiceFactory::~DomDistillerServiceFactory() {
-}
+DomDistillerServiceFactory::~DomDistillerServiceFactory() {}
 
 std::unique_ptr<KeyedService>
 DomDistillerServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
   scoped_refptr<base::SequencedTaskRunner> background_task_runner =
       web::WebThread::GetBlockingPool()->GetSequencedTaskRunner(
           web::WebThread::GetBlockingPool()->GetSequenceToken());
 
   std::unique_ptr<leveldb_proto::ProtoDatabaseImpl<ArticleEntry>> db(
       new leveldb_proto::ProtoDatabaseImpl<ArticleEntry>(

[sdefresne, 2016/12/20 15:41:00]

Please convert all those naked new to base::MakeUnique<> (maybe as a followup).

[gambard, 2016/12/20 17:11:42]

Done.

           background_task_runner));
 
   base::FilePath database_dir(
       context->GetStatePath().Append(FILE_PATH_LITERAL("Articles")));
 
   std::unique_ptr<DomDistillerStore> dom_distiller_store(
       new DomDistillerStore(std::move(db), database_dir));
 
+  std::unique_ptr<FaviconWebStateDispatcher> web_state_dispatcher =
+      base::MakeUnique<FaviconWebStateDispatcherImpl>(context);
   std::unique_ptr<DistillerPageFactory> distiller_page_factory(
-      new DistillerPageFactoryIOS(context));
+      new DistillerPageFactoryIOS(std::move(web_state_dispatcher)));
+
   std::unique_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory(
       new DistillerURLFetcherFactory(context->GetRequestContext()));
 
   dom_distiller::proto::DomDistillerOptions options;
   std::unique_ptr<DistillerFactory> distiller_factory(new DistillerFactoryImpl(
       std::move(distiller_url_fetcher_factory), options));
   std::unique_ptr<DistilledPagePrefs> distilled_page_prefs(
       new DistilledPagePrefs(
           ios::ChromeBrowserState::FromBrowserState(context)->GetPrefs()));
 
   return base::MakeUnique<DomDistillerKeyedService>(
       std::move(dom_distiller_store), std::move(distiller_factory),
       std::move(distiller_page_factory), std::move(distilled_page_prefs));
 }
 
 web::BrowserState* DomDistillerServiceFactory::GetBrowserStateToUse(
     web::BrowserState* context) const {
   // Makes normal profile and off-the-record profile use same service instance.
   return GetBrowserStateRedirectedInIncognito(context);
 }
 
 }  // namespace dom_distiller