Remove ServiceIsNullForTesting override for FaviconServiceFactory

ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h

 // 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.
 
 #ifndef IOS_CHROME_BROWSER_FAVICON_IOS_CHROME_LARGE_ICON_SERVICE_FACTORY_H_
 #define IOS_CHROME_BROWSER_FAVICON_IOS_CHROME_LARGE_ICON_SERVICE_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
 
 class KeyedService;

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

nit: this is not required as the type is already defined in
components/keyed_service/ios/browser_state_keyed_service_factory.h

 
 namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
 }
 
 namespace favicon {
 class LargeIconService;
 };
 
 namespace ios {
 class ChromeBrowserState;
 }
 
 // Singleton that owns all LargeIconService and associates them with
 // ChromeBrowserState.
 class IOSChromeLargeIconServiceFactory
     : public BrowserStateKeyedServiceFactory {
  public:
   static favicon::LargeIconService* GetForBrowserState(
       ios::ChromeBrowserState* browser_state);
 
   static IOSChromeLargeIconServiceFactory* GetInstance();
 
+  // Returns the default factory used to build IOSChromeLargeIconService. Can be
+  // registered with SetTestingFactory to use the IOSChromeLargeIconService
+  // instance during testing.
+  static TestingFactoryFunction GetDefaultFactory();
+
  private:
   friend struct base::DefaultSingletonTraits<IOSChromeLargeIconServiceFactory>;
 
   IOSChromeLargeIconServiceFactory();
   ~IOSChromeLargeIconServiceFactory() override;
 
   // BrowserStateKeyedServiceFactory implementation.
   scoped_ptr<KeyedService> BuildServiceInstanceFor(
       web::BrowserState* context) const override;
   web::BrowserState* GetBrowserStateToUse(
       web::BrowserState* context) const override;
 

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

The class does not override ServiceIsNULLWhileTesting() so by default the
factory can be used during testing without registering a custom factory. I think
all changes to
ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.{cc,h} should
be removed (i.e. they make the code more complex for nothing).

   DISALLOW_COPY_AND_ASSIGN(IOSChromeLargeIconServiceFactory);
 };
 
 #endif  // IOS_CHROME_BROWSER_FAVICON_IOS_CHROME_LARGE_ICON_SERVICE_FACTORY_H_