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/extensions.
This CL was uploaded by git cl split.
[email protected]
Bug: 809610
Change-Id: I8acd294b25decd9f81be9cb8b76c41f3302644af
Reviewed-on: https://chromium-review.googlesource.com/c/1258171
Commit-Queue: Sylvain Defresne <[email protected]>
Reviewed-by: Istiaque Ahmed <[email protected]>
Cr-Commit-Position: refs/heads/master@{#596632}diff --git a/chrome/browser/extensions/extension_action_runner_unittest.cc b/chrome/browser/extensions/extension_action_runner_unittest.cc
index 647784792..9b56ed3 100644
--- a/chrome/browser/extensions/extension_action_runner_unittest.cc
+++ b/chrome/browser/extensions/extension_action_runner_unittest.cc
@@ -178,8 +178,8 @@
extensions_features::kRuntimeHostPermissions);
// Skip syncing for testing purposes.
- ExtensionSyncServiceFactory::GetInstance()->SetTestingFactory(profile(),
- nullptr);
+ ExtensionSyncServiceFactory::GetInstance()->SetTestingFactory(
+ profile(), BrowserContextKeyedServiceFactory::TestingFactory());
TabHelper::CreateForWebContents(web_contents());
TabHelper* tab_helper = TabHelper::FromWebContents(web_contents());
diff --git a/chrome/browser/extensions/extension_action_test_util.cc b/chrome/browser/extensions/extension_action_test_util.cc
index b4ff1103..d98e1088 100644
--- a/chrome/browser/extensions/extension_action_test_util.cc
+++ b/chrome/browser/extensions/extension_action_test_util.cc
@@ -6,6 +6,7 @@
#include <memory>
+#include "base/bind.h"
#include "base/run_loop.h"
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_action_manager.h"
@@ -71,7 +72,7 @@
// No existing model means it's a new profile (since we, by default, don't
// create the ToolbarModel in testing).
ToolbarActionsModelFactory::GetInstance()->SetTestingFactory(
- profile, &BuildToolbarModel);
+ profile, base::BindRepeating(&BuildToolbarModel));
model = ToolbarActionsModel::Get(profile);
if (wait_for_ready) {
// Fake the extension system ready signal.
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index b57291bf..f4e17d3 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/bind.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -448,7 +449,8 @@
MenuManager* manager = static_cast<MenuManager*>(
(MenuManagerFactory::GetInstance()->SetTestingFactoryAndUse(
profile(),
- &MenuManagerFactory::BuildServiceInstanceForTesting)));
+ base::BindRepeating(
+ &MenuManagerFactory::BuildServiceInstanceForTesting))));
ASSERT_TRUE(manager);
MenuBuilder builder(extension, GetBrowser(), manager);
@@ -496,7 +498,8 @@
// Create a MenuManager for adding context items.
MenuManager* manager = static_cast<MenuManager*>(
MenuManagerFactory::GetInstance()->SetTestingFactoryAndUse(
- profile(), &MenuManagerFactory::BuildServiceInstanceForTesting));
+ profile(), base::BindRepeating(
+ &MenuManagerFactory::BuildServiceInstanceForTesting)));
ASSERT_TRUE(manager);
MenuBuilder builder(extension, GetBrowser(), manager);
@@ -1374,7 +1377,9 @@
// Create a MenuManager for adding context items.
MenuManager* manager = static_cast<MenuManager*>(
(MenuManagerFactory::GetInstance()->SetTestingFactoryAndUse(
- profile(), &MenuManagerFactory::BuildServiceInstanceForTesting)));
+ profile(),
+ base::BindRepeating(
+ &MenuManagerFactory::BuildServiceInstanceForTesting))));
ASSERT_TRUE(manager);
MenuBuilder builder(extension, GetBrowser(), manager);
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index 5573415..4da06134 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -7,6 +7,7 @@
#include <memory>
#include <utility>
+#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/macros.h"
@@ -342,12 +343,13 @@
service_ = ExtensionSystem::Get(profile())->extension_service();
service_->Init();
- extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->
- SetTestingFactory(profile(), &BuildOverrideRegistrar);
+ extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()
+ ->SetTestingFactory(profile(),
+ base::BindRepeating(&BuildOverrideRegistrar));
extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(
profile());
ToolbarActionsModelFactory::GetInstance()->SetTestingFactory(
- profile(), &BuildToolbarModel);
+ profile(), base::BindRepeating(&BuildToolbarModel));
}
~ExtensionMessageBubbleTest() override {}
@@ -725,7 +727,7 @@
Profile* off_the_record_profile = profile()->GetOffTheRecordProfile();
ToolbarActionsModelFactory::GetInstance()->SetTestingFactory(
- off_the_record_profile, &BuildToolbarModel);
+ off_the_record_profile, base::BindRepeating(&BuildToolbarModel));
std::unique_ptr<BrowserWindow> off_the_record_window(CreateBrowserWindow());
std::unique_ptr<Browser> off_the_record_browser(
diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc
index 09a169b..ff4893c 100644
--- a/chrome/browser/extensions/extension_service_test_base.cc
+++ b/chrome/browser/extensions/extension_service_test_base.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/memory/ref_counted.h"
@@ -135,7 +136,8 @@
// Garbage collector is typically NULL during tests, so give it a build.
ExtensionGarbageCollectorFactory::GetInstance()->SetTestingFactoryAndUse(
- profile_.get(), &ExtensionGarbageCollectorFactory::BuildInstanceFor);
+ profile_.get(),
+ base::BindRepeating(&ExtensionGarbageCollectorFactory::BuildInstanceFor));
}
void ExtensionServiceTestBase::InitializeEmptyExtensionService() {
diff --git a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
index 64d30d0..fdd1eff 100644
--- a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
+++ b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/bind.h"
#include "base/optional.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
@@ -197,7 +198,7 @@
// Setting a testing factory function deletes the current
// ExtensionStorageMonitor; see KeyedServiceFactory::SetTestingFactory().
ExtensionStorageMonitorFactory::GetInstance()->SetTestingFactoryAndUse(
- profile(), &CreateExtensionStorageMonitorInstance);
+ profile(), base::BindRepeating(&CreateExtensionStorageMonitorInstance));
InitStorageMonitor();
}
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc
index 1c016c3..c8b82c55 100644
--- a/chrome/browser/extensions/extension_web_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/extension_web_ui.h"
+#include "base/bind.h"
#include "base/command_line.h"
#include "base/run_loop.h"
#include "build/build_config.h"
@@ -50,7 +51,7 @@
extension_service_ = system->CreateExtensionService(
base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->SetTestingFactory(
- profile_.get(), &BuildOverrideRegistrar);
+ profile_.get(), base::BindRepeating(&BuildOverrideRegistrar));
ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(profile_.get());
}
diff --git a/chrome/browser/extensions/external_pref_loader_unittest.cc b/chrome/browser/extensions/external_pref_loader_unittest.cc
index ffb73e0..edcb817 100644
--- a/chrome/browser/extensions/external_pref_loader_unittest.cc
+++ b/chrome/browser/extensions/external_pref_loader_unittest.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "chrome/browser/extensions/external_pref_loader.h"
+
+#include "base/bind.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/task/post_task.h"
@@ -125,7 +127,7 @@
TEST_F(ExternalPrefLoaderTest, PrefReadInitiatesCorrectly) {
TestSyncService* test_service = static_cast<TestSyncService*>(
ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
- profile(), &TestingSyncFactoryFunction));
+ profile(), base::BindRepeating(&TestingSyncFactoryFunction)));
base::RunLoop run_loop;
scoped_refptr<ExternalPrefLoader> loader(
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index 1ac3429..98583abd 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -8,6 +8,7 @@
#include <utility>
#include <vector>
+#include "base/bind.h"
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_reader.h"
#include "base/macros.h"
@@ -571,7 +572,7 @@
TestingProfile profile;
MockEventRouter* mock_event_router = static_cast<MockEventRouter*>(
EventRouterFactory::GetInstance()->SetTestingFactoryAndUse(
- &profile, &MockEventRouterFactoryFunction));
+ &profile, base::BindRepeating(&MockEventRouterFactoryFunction)));
content::ContextMenuParams params;
params.media_type = blink::WebContextMenuData::kMediaTypeImage;
diff --git a/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc b/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc
index 65624e8..70a2e0eb 100644
--- a/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc
+++ b/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc
@@ -6,6 +6,7 @@
#include <memory>
+#include "base/bind.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_test_base.h"
#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
@@ -48,7 +49,7 @@
InitializeEmptyExtensionService();
ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->SetTestingFactory(
- profile(), &BuildOverrideRegistrar);
+ profile(), base::BindRepeating(&BuildOverrideRegistrar));
// We need to trigger the instantiation of the WebUIOverrideRegistrar for
// it to be constructed, since by default it's not constructed in tests.
ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(profile());
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 34ec1a5..5d10948 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -508,7 +508,8 @@
void SetUpOnMainThread() override {
NotificationDisplayServiceFactory::GetInstance()->SetTestingFactory(
- profile(), &StubNotificationDisplayService::FactoryForTests);
+ profile(),
+ base::BindRepeating(&StubNotificationDisplayService::FactoryForTests));
gcm::FakeGCMProfileService* gcm_service =
static_cast<gcm::FakeGCMProfileService*>(
diff --git a/chrome/browser/extensions/update_install_gate_unittest.cc b/chrome/browser/extensions/update_install_gate_unittest.cc
index b27ca18a..7e1bf6a 100644
--- a/chrome/browser/extensions/update_install_gate_unittest.cc
+++ b/chrome/browser/extensions/update_install_gate_unittest.cc
@@ -6,6 +6,7 @@
#include <memory>
+#include "base/bind.h"
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
@@ -137,7 +138,7 @@
event_router_ = static_cast<EventRouter*>(
EventRouterFactory::GetInstance()->SetTestingFactoryAndUse(
- profile_, &BuildEventRouter));
+ profile_, base::BindRepeating(&BuildEventRouter)));
delayer_.reset(new UpdateInstallGate(service_));
