Remove ServiceIsNullForTesting override for FaviconServiceFactory

ios/chrome/browser/favicon/favicon_service_factory.cc

Index: ios/chrome/browser/favicon/favicon_service_factory.cc
diff --git a/ios/chrome/browser/favicon/favicon_service_factory.cc b/ios/chrome/browser/favicon/favicon_service_factory.cc
index 1edd1644c907d1117a8f94b7d17652de25de5e4a..3eaa02a1e9de979befec935f20c61b0a20ddad67 100644
--- a/ios/chrome/browser/favicon/favicon_service_factory.cc
+++ b/ios/chrome/browser/favicon/favicon_service_factory.cc
@@ -14,6 +14,15 @@
 
 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,
@@ -49,16 +58,17 @@ 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