Extend FaviconService to support fetching favicons from a Google server

ios/chrome/browser/favicon/favicon_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/favicon/favicon_service_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "components/favicon/core/favicon_service.h"
+#include "components/image_fetcher/image_decoder.h"

[pkotwicz, 2017/02/07 04:55:55]

Nit: I think you don't need this include

+#include "components/image_fetcher/image_fetcher_impl.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/favicon/favicon_client_impl.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
+#include "ios/chrome/browser/suggestions/ios_image_decoder_impl.h"
 
 namespace ios {
 
 // static
 favicon::FaviconService* FaviconServiceFactory::GetForBrowserState(
     ios::ChromeBrowserState* browser_state,
     ServiceAccessType access_type) {
   if (!browser_state->IsOffTheRecord()) {
     return static_cast<favicon::FaviconService*>(
         GetInstance()->GetServiceForBrowserState(browser_state, true));
@@ skipping 21 matching lines @@
 }
 
 FaviconServiceFactory::~FaviconServiceFactory() {
 }
 
 std::unique_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromBrowserState(context);
   return base::MakeUnique<favicon::FaviconService>(
       base::MakeUnique<FaviconClientImpl>(),

[jkrcal, 2017/02/06 19:01:22]

I am sorry, I've mixed in one rebase line.

       ios::HistoryServiceFactory::GetForBrowserState(
-          browser_state, ServiceAccessType::EXPLICIT_ACCESS));
+          browser_state, ServiceAccessType::EXPLICIT_ACCESS),
+      base::MakeUnique<image_fetcher::ImageFetcherImpl>(
+          base::MakeUnique<suggestions::IOSImageDecoderImpl>(),
+          browser_state->GetRequestContext()));
 }
 
 }  // namespace ios