Remove ServiceIsNullForTesting override for FaviconServiceFactory

ios/chrome/browser/favicon/favicon_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_FAVICON_SERVICE_FACTORY_H_
 #define IOS_CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
@@ skipping 14 matching lines @@
 class ChromeBrowserState;
 
 // Singleton that owns all FaviconServices and associates them with
 // ios::ChromeBrowserState.
 class FaviconServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static favicon::FaviconService* GetForBrowserState(
       ios::ChromeBrowserState* browser_state,
       ServiceAccessType access_type);
   static FaviconServiceFactory* GetInstance();
+  // Returns the default factory used to build IOSChromeLargeIconService. Can be

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

nit: blank line before the comment (as you did in
ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h).

s/IOSChromeLargeIconService/FaviconServiceFactory/ (and below)
  ^ a.k.a. copy-n-paste fail ;-)

+  // registered with SetTestingFactory to use the IOSChromeLargeIconService
+  // instance during testing.
+  static TestingFactoryFunction GetDefaultFactory();
 
  private:
   friend struct base::DefaultSingletonTraits<FaviconServiceFactory>;
 
   FaviconServiceFactory();
   ~FaviconServiceFactory() override;
 
   // BrowserStateKeyedServiceFactory implementation.
   scoped_ptr<KeyedService> BuildServiceInstanceFor(
       web::BrowserState* context) const override;
   bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconServiceFactory);
 };
 
 }  // namespace ios
 
 #endif  // IOS_CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_