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

This CL was uploaded by git cl split.

R=isherman@chromium.org

Bug: 809610
Change-Id: I43fdd2d998182d420a2ccce7f9c9bc268f02a779
Reviewed-on: https://chromium-review.googlesource.com/1245714
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595849}

chrome/browser/google/google_url_tracker_factory.cc

@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/bind.h"
 #include "base/feature_list.h"
 #include "chrome/browser/google/chrome_google_url_tracker_client.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ -49,9 +50,9 @@ std::unique_ptr<KeyedService> BuildGoogleURLTracker(
 }  // namespace
 
 // static
-BrowserContextKeyedServiceFactory::TestingFactoryFunction
+BrowserContextKeyedServiceFactory::TestingFactory
 GoogleURLTrackerFactory::GetDefaultFactory() {
-  return &BuildGoogleURLTracker;
+  return base::BindRepeating(&BuildGoogleURLTracker);
 }
 
 GoogleURLTrackerFactory::GoogleURLTrackerFactory()

chrome/browser/google/google_url_tracker_factory.h

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