Remove direct uses of TestingFunctionFactory

Replace them with uses of TestingFactory which is based
on base::Callback<> instead of function pointers.

This converts uses in /chrome/browser/favicon.

This CL was uploaded by git cl split.

R=caitkp@chromium.org

Bug: 809610
Change-Id: I050d6189e8eb2f2f80a6670ab3649218fabcd1ae
Reviewed-on: https://chromium-review.googlesource.com/c/1246170Reviewed-by: Cait Phillips <caitkp@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596185}

chrome/browser/favicon/favicon_service_factory.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
@@ -54,9 +55,9 @@ FaviconServiceFactory* FaviconServiceFactory::GetInstance() {
 }
 
 // static
-BrowserContextKeyedServiceFactory::TestingFactoryFunction
+BrowserContextKeyedServiceFactory::TestingFactory
 FaviconServiceFactory::GetDefaultFactory() {
-  return &BuildFaviconService;
+  return base::BindRepeating(&BuildFaviconService);
 }
 
 FaviconServiceFactory::FaviconServiceFactory()

chrome/browser/favicon/favicon_service_factory.h

@@ -33,7 +33,7 @@ class FaviconServiceFactory : public BrowserContextKeyedServiceFactory {
 
   // Returns the default factory used to build FaviconService. Can be registered
   // with SetTestingFactory to use the FaviconService instance during testing.
-  static TestingFactoryFunction GetDefaultFactory();
+  static TestingFactory GetDefaultFactory();
 
  private:
   friend struct base::DefaultSingletonTraits<FaviconServiceFactory>;