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/bookmarks.

This CL was uploaded by git cl split.

R=sky@chromium.org

Bug: 809610
Change-Id: I465d088e3eba92a29a1c03b1e73fb4ceb920a1e3
Reviewed-on: https://chromium-review.googlesource.com/1245730
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595851}

chrome/browser/bookmarks/managed_bookmark_service_factory.cc

@@ -43,9 +43,9 @@ ManagedBookmarkServiceFactory* ManagedBookmarkServiceFactory::GetInstance() {
 }
 
 // static
-BrowserContextKeyedServiceFactory::TestingFactoryFunction
+BrowserContextKeyedServiceFactory::TestingFactory
 ManagedBookmarkServiceFactory::GetDefaultFactory() {
-  return &BuildManagedBookmarkService;
+  return base::BindRepeating(&BuildManagedBookmarkService);
 }
 
 // static

chrome/browser/bookmarks/managed_bookmark_service_factory.h

@@ -27,7 +27,7 @@ class ManagedBookmarkServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
   static bookmarks::ManagedBookmarkService* GetForProfile(Profile* profile);
   static ManagedBookmarkServiceFactory* GetInstance();
-  static TestingFactoryFunction GetDefaultFactory();
+  static TestingFactory GetDefaultFactory();
 
   static std::string GetManagedBookmarksDomain(Profile* profile);