Componentize FaviconService and FaviconHandler

chrome/browser/favicon/favicon_service_factory.cc

 // Copyright (c) 2012 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/favicon/favicon_service_factory.h"
 
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
-#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/favicon/core/browser/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 // static
 FaviconService* FaviconServiceFactory::GetForProfile(Profile* profile,
                                                      ServiceAccessType sat) {
   if (!profile->IsOffTheRecord()) {
     return static_cast<FaviconService*>(
         GetInstance()->GetServiceForBrowserContext(profile, true));
   } else if (sat == ServiceAccessType::EXPLICIT_ACCESS) {
@@ skipping 28 matching lines @@
     content::BrowserContext* context) const {
   Profile* profile = Profile::FromBrowserContext(context);
   return new FaviconService(ChromeFaviconClientFactory::GetForProfile(profile),
                             HistoryServiceFactory::GetForProfile(
                                 profile, ServiceAccessType::EXPLICIT_ACCESS));
 }
 
 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }