Commit 29ce3d0f authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Convert indirect uses of TestingFactoryFunction

TestingFactoryFunction is a simple function pointer. It is
deprecated in favor of TestingFactory which is a Callback<>.
Convert indirect uses by using base::BindRepeating() in all
invocation of SetTestingFactory/AddTestingFactory.

This converts uses in src//chrome/browser/sync.

This CL was uploaded by git cl split.

R=melandory@chromium.org

Bug: 809610
Change-Id: Ie5cf8f1bb9884eb74ed4bd44697b8b5a94a85e39
Reviewed-on: https://chromium-review.googlesource.com/c/1258169
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarTatiana Gornak <melandory@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596647}
parent 8163b963
......@@ -8,6 +8,7 @@
#include <memory>
#include "base/bind.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
#include "chrome/browser/notifications/notification_display_service_tester.h"
......@@ -73,7 +74,7 @@ class SyncErrorNotifierTest : public BrowserWithTestWindowTest {
FakeLoginUIService* login_ui_service = static_cast<FakeLoginUIService*>(
LoginUIServiceFactory::GetInstance()->SetTestingFactoryAndUse(
profile(), BuildMockLoginUIService));
profile(), base::BindRepeating(&BuildMockLoginUIService)));
login_ui_service->SetLoginUI(&login_ui_);
error_notifier_ =
......
......@@ -6,6 +6,7 @@
#include <memory>
#include "base/bind.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/profile_sync_test_util.h"
#include "chrome/test/base/testing_profile.h"
......@@ -36,7 +37,7 @@ class SyncStartupTrackerTest : public testing::Test {
profile_ = std::make_unique<TestingProfile>();
mock_pss_ = static_cast<browser_sync::ProfileSyncServiceMock*>(
ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
profile_.get(), BuildMockProfileSyncService));
profile_.get(), base::BindRepeating(&BuildMockProfileSyncService)));
ON_CALL(*mock_pss_, GetAuthError()).WillByDefault(ReturnRef(no_error_));
ON_CALL(*mock_pss_, GetRegisteredDataTypes())
......
......@@ -31,7 +31,7 @@ namespace {
void OnWillCreateBrowserContextServices(content::BrowserContext* context) {
GaiaCookieManagerServiceFactory::GetInstance()->SetTestingFactory(
context, &BuildFakeGaiaCookieManagerService);
context, base::BindRepeating(&BuildFakeGaiaCookieManagerService));
}
} // namespace
......
......@@ -666,7 +666,8 @@ void SyncTest::SetUpInvalidations(int index) {
invalidation::ProfileInvalidationProviderFactory::GetInstance()
->SetTestingFactoryAndUse(
GetProfile(index),
BuildFakeServerProfileInvalidationProvider);
base::BindRepeating(
&BuildFakeServerProfileInvalidationProvider));
} else {
test_factory =
......@@ -674,7 +675,8 @@ void SyncTest::SetUpInvalidations(int index) {
GetInstance()
->SetTestingFactoryAndUse(
GetProfile(index),
BuildFakeServerProfileInvalidationProvider);
base::BindRepeating(
&BuildFakeServerProfileInvalidationProvider));
}
invalidation::InvalidationService* invalidation_service =
static_cast<invalidation::ProfileInvalidationProvider*>(test_factory)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment