Remove ServiceIsNullForTesting override for FaviconServiceFactory

ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.cc

Index: ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.cc
diff --git a/ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.cc b/ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.cc
index 354e62bf9523ef4608f0d0b3d40b98fe70e33323..ce2cdcae7ab6709a849e5126403f3630bdb1800c 100644
--- a/ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.cc
+++ b/ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.cc
@@ -14,6 +14,18 @@
 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/web/public/web_thread.h"
 
+namespace {
+scoped_ptr<KeyedService> BuildIOSChromeLargeIconService(

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

nit: s/BuildIOSChromeLargeIconService/BuildLargeIconService/ (this is a private
name in an anonymous namespace, so no risk of confusion)

+    web::BrowserState* context) {
+  ios::ChromeBrowserState* browser_state =
+      ios::ChromeBrowserState::FromBrowserState(context);
+
+  return make_scoped_ptr(new favicon::LargeIconService(
+      ios::FaviconServiceFactory::GetForBrowserState(
+          browser_state, ServiceAccessType::EXPLICIT_ACCESS),
+      web::WebThread::GetBlockingPool()));
+}
+}

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

nit: }  // namespace

 // static

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

nit: blank line before // static

 favicon::LargeIconService* IOSChromeLargeIconServiceFactory::GetForBrowserState(
     ios::ChromeBrowserState* browser_state) {
@@ -37,16 +49,16 @@ IOSChromeLargeIconServiceFactory::~IOSChromeLargeIconServiceFactory() {}
 scoped_ptr<KeyedService>
 IOSChromeLargeIconServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
-
-  return make_scoped_ptr(new favicon::LargeIconService(
-      ios::FaviconServiceFactory::GetForBrowserState(
-          browser_state, ServiceAccessType::EXPLICIT_ACCESS),
-      web::WebThread::GetBlockingPool()));
+  return BuildIOSChromeLargeIconService(context);
 }
 
 web::BrowserState* IOSChromeLargeIconServiceFactory::GetBrowserStateToUse(
     web::BrowserState* context) const {
   return GetBrowserStateOwnInstanceInIncognito(context);
 }
+
+// static
+BrowserStateKeyedServiceFactory::TestingFactoryFunction
+IOSChromeLargeIconServiceFactory::GetDefaultFactory() {
+  return &BuildIOSChromeLargeIconService;
+}