Remove deprecated method of BCKSF

All clients of BCKSF uses the new API taking a base::Callback<>
instead of the deprecated API that was using a raw function
pointer.

Remove the now obsolete deprecated API.

Bug: 809610
Change-Id: I18359b2f91a1a6d9445affcf4720eed528d74af3
Reviewed-on: https://chromium-review.googlesource.com/c/1297354Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603106}

chrome/test/base/testing_profile.cc

@@ -1056,15 +1056,6 @@ void TestingProfile::Builder::SetProfileName(const std::string& profile_name) {
   profile_name_ = profile_name;
 }
 
-void TestingProfile::Builder::AddTestingFactory(
-    BrowserContextKeyedServiceFactory* service_factory,
-    BrowserContextKeyedServiceFactory::TestingFactoryFunction function) {
-  BrowserContextKeyedServiceFactory::TestingFactory testing_factory;
-  if (function)
-    testing_factory = base::BindRepeating(function);
-  AddTestingFactory(service_factory, std::move(testing_factory));
-}
-
 void TestingProfile::Builder::AddTestingFactory(
     BrowserContextKeyedServiceFactory* service_factory,
     BrowserContextKeyedServiceFactory::TestingFactory testing_factory) {

chrome/test/base/testing_profile.h

@@ -91,14 +91,6 @@ class TestingProfile : public Profile {
     // initialization is complete.
     void SetDelegate(Delegate* delegate);
 
-    // Adds a testing factory to the TestingProfile. These testing factories
-    // are applied before the ProfileKeyedServices are created.
-    // DEPRECATED: use TestingFactory version instead, see
-    // http://crbug.com/809610
-    void AddTestingFactory(
-        BrowserContextKeyedServiceFactory* service_factory,
-        BrowserContextKeyedServiceFactory::TestingFactoryFunction function);
-
     // Adds a testing factory to the TestingProfile. These testing factories
     // are applied before the ProfileKeyedServices are created.
     void AddTestingFactory(

components/keyed_service/content/browser_context_keyed_service_factory.cc

@@ -13,23 +13,6 @@
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 
-void BrowserContextKeyedServiceFactory::SetTestingFactory(
-    content::BrowserContext* context,
-    TestingFactoryFunction testing_factory) {
-  TestingFactory wrapped_factory;
-  if (testing_factory) {
-    wrapped_factory = base::BindRepeating(testing_factory);
-  }
-  SetTestingFactory(context, std::move(wrapped_factory));
-}
-
-KeyedService* BrowserContextKeyedServiceFactory::SetTestingFactoryAndUse(
-    content::BrowserContext* context,
-    TestingFactoryFunction testing_factory) {
-  DCHECK(testing_factory);
-  return SetTestingFactoryAndUse(context, base::BindRepeating(testing_factory));
-}
-
 void BrowserContextKeyedServiceFactory::SetTestingFactory(
     content::BrowserContext* context,
     TestingFactory testing_factory) {

components/keyed_service/content/browser_context_keyed_service_factory.h

@@ -39,28 +39,6 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory
   void RegisterUserPrefsOnBrowserContextForTest(
       content::BrowserContext* context);
 
-  // A function that supplies the instance of a KeyedService for a given
-  // BrowserContext. This is used primarily for testing, where we want to feed
-  // a specific mock into the BCKSF system.
-  // DEPRECATED: use TestingFactory instead, see http://crbug.com/809610
-  using TestingFactoryFunction =
-      std::unique_ptr<KeyedService> (*)(content::BrowserContext* context);
-
-  // Associates |factory| with |context| so that |factory| is used to create
-  // the KeyedService when requested.  |factory| can be NULL to signal that
-  // KeyedService should be NULL. Multiple calls to SetTestingFactory() are
-  // allowed; previous services will be shut down.
-  // DEPRECATED: use TestingFactory version instead, see http://crbug.com/809610
-  void SetTestingFactory(content::BrowserContext* context,
-                         TestingFactoryFunction factory);
-
-  // Associates |factory| with |context| and immediately returns the created
-  // KeyedService. Since the factory will be used immediately, it may not be
-  // NULL.
-  // DEPRECATED: use TestingFactory version instead, see http://crbug.com/809610
-  KeyedService* SetTestingFactoryAndUse(content::BrowserContext* context,
-                                        TestingFactoryFunction factory);
-
   // A callback that supplies the instance of a KeyedService for a given
   // BrowserContext. This is used primarily for testing, where we want to feed
   // a specific test double into the BCKSF system.

components/keyed_service/content/refcounted_browser_context_keyed_service_factory.cc

@@ -10,24 +10,6 @@
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "content/public/browser/browser_context.h"
 
-void RefcountedBrowserContextKeyedServiceFactory::SetTestingFactory(
-    content::BrowserContext* context,
-    TestingFactoryFunction testing_factory) {
-  TestingFactory wrapped_factory;
-  if (testing_factory) {
-    wrapped_factory = base::BindRepeating(testing_factory);
-  }
-  SetTestingFactory(context, std::move(wrapped_factory));
-}
-
-scoped_refptr<RefcountedKeyedService>
-RefcountedBrowserContextKeyedServiceFactory::SetTestingFactoryAndUse(
-    content::BrowserContext* context,
-    TestingFactoryFunction testing_factory) {
-  DCHECK(testing_factory);
-  return SetTestingFactoryAndUse(context, base::BindRepeating(testing_factory));
-}
-
 void RefcountedBrowserContextKeyedServiceFactory::SetTestingFactory(
     content::BrowserContext* context,
     TestingFactory testing_factory) {

components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h

@@ -30,29 +30,6 @@ class BrowserContext;
 class KEYED_SERVICE_EXPORT RefcountedBrowserContextKeyedServiceFactory
     : public RefcountedKeyedServiceFactory {
  public:
-  // A function that supplies the instance of a KeyedService for a given
-  // BrowserContext. This is used primarily for testing, where we want to feed
-  // a specific mock into the BCKSF system.
-  // DEPRECATED: use TestingFactory instead, see http://crbug.com/809610
-  using TestingFactoryFunction = scoped_refptr<RefcountedKeyedService> (*)(
-      content::BrowserContext* context);
-
-  // Associates |factory| with |context| so that |factory| is used to create
-  // the KeyedService when requested.  |factory| can be NULL to signal that
-  // KeyedService should be NULL. Multiple calls to SetTestingFactory() are
-  // allowed; previous services will be shut down.
-  // DEPRECATED: use TestingFactory version instead, see http://crbug.com/809610
-  void SetTestingFactory(content::BrowserContext* context,
-                         TestingFactoryFunction factory);
-
-  // Associates |factory| with |context| and immediately returns the created
-  // KeyedService. Since the factory will be used immediately, it may not be
-  // NULL.
-  // DEPRECATED: use TestingFactory version instead, see http://crbug.com/809610
-  scoped_refptr<RefcountedKeyedService> SetTestingFactoryAndUse(
-      content::BrowserContext* context,
-      TestingFactoryFunction factory);
-
   // A callback that supplies the instance of a KeyedService for a given
   // BrowserContext. This is used primarily for testing, where we want to feed
   // a specific test double into the BCKSF system.