Remove ServiceIsNullForTesting override for FaviconServiceFactory

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/singleton.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "ios/chrome/browser/favicon/favicon_client_impl.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
 
 namespace ios {
 
+scoped_ptr<KeyedService> BuildFaviconService(web::BrowserState* context) {

[sdefresne, 2015/11/21 01:52:03]

Please put in an anonymous namespace:

namespace ios {
namespace {
scoped_ptr<KeyedService> BuildFaviconService(web::BrowserState* context) {
...

+  ios::ChromeBrowserState* browser_state =
+      ios::ChromeBrowserState::FromBrowserState(context);
+  return make_scoped_ptr(new favicon::FaviconService(
+      make_scoped_ptr(new FaviconClientImpl(browser_state)),
+      ios::HistoryServiceFactory::GetForBrowserState(
+          browser_state, ServiceAccessType::EXPLICIT_ACCESS)));
+}
+
 // 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));
   } else if (access_type == ServiceAccessType::EXPLICIT_ACCESS) {
     return static_cast<favicon::FaviconService*>(
         GetInstance()->GetServiceForBrowserState(
@@ skipping 15 matching lines @@
           "FaviconService",
           BrowserStateDependencyManager::GetInstance()) {
   DependsOn(ios::HistoryServiceFactory::GetInstance());
 }
 
 FaviconServiceFactory::~FaviconServiceFactory() {
 }
 
 scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
-  return make_scoped_ptr(new favicon::FaviconService(
-      make_scoped_ptr(new FaviconClientImpl(browser_state)),
-      ios::HistoryServiceFactory::GetForBrowserState(
-          browser_state, ServiceAccessType::EXPLICIT_ACCESS)));
+  return BuildFaviconService(context);
 }
 
 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {

[sdefresne, 2015/11/21 01:52:03]

Could you investigate whether removing this override works? This would allow the
factory to be used even during testing. I do not think that this service would
cause the test to slow too much, nor cause any failures. If you do remove the
override, then there is no need for GetDefaultFactory() nor the rest of the CL.

   return true;
 }
 
+// Static

[sdefresne, 2015/11/21 01:52:03]

s/Static/static/

+BrowserStateKeyedServiceFactory::TestingFactoryFunction
+FaviconServiceFactory::GetDefaultFactory() {
+  return &BuildFaviconService;
+}
+
 }  // namespace ios