Sync: Use SequencedTaskRunner instead of SingleThreadTaskRunner
In ProfileSyncComponentsFactoryImpl, ChromeSyncClient, and the
Autofill DataTypeControllers.
Bug: none
Change-Id: Icd07849f6317451a2303208a8603a214fc3e2c6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530914
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Auto-Submit: Marc Treib <treib@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642925}diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index ea72d5f..72997ff7 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -189,8 +189,7 @@
component_factory_ = std::make_unique<ProfileSyncComponentsFactoryImpl>(
this, chrome::GetChannel(), prefs::kSavingBrowserHistoryDisabled,
- base::CreateSingleThreadTaskRunnerWithTraits(
- {content::BrowserThread::UI}),
+ base::CreateSequencedTaskRunnerWithTraits({content::BrowserThread::UI}),
web_data_service_thread_, profile_web_data_service_,
account_web_data_service_, password_store_,
BookmarkSyncServiceFactory::GetForProfile(profile_));
@@ -421,7 +420,7 @@
} else {
controllers.push_back(std::make_unique<AsyncDirectoryTypeController>(
syncer::APP_LIST, dump_stack, sync_service, this, syncer::GROUP_UI,
- base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})));
+ base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI})));
}
#endif // BUILDFLAG(ENABLE_APP_LIST)
@@ -438,7 +437,7 @@
} else {
controllers.push_back(std::make_unique<AsyncDirectoryTypeController>(
syncer::DICTIONARY, dump_stack, sync_service, this, syncer::GROUP_UI,
- base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})));
+ base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI})));
}
}
#endif // defined(OS_LINUX) || defined(OS_WIN)
diff --git a/chrome/browser/sync/chrome_sync_client.h b/chrome/browser/sync/chrome_sync_client.h
index c89058c..e4891d6 100644
--- a/chrome/browser/sync/chrome_sync_client.h
+++ b/chrome/browser/sync/chrome_sync_client.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
+#include "base/sequenced_task_runner.h"
#include "chrome/browser/sync/glue/extensions_activity_monitor.h"
#include "components/browser_sync/browser_sync_client.h"
#include "components/sync/model/model_type_store_service.h"
@@ -77,7 +77,7 @@
scoped_refptr<password_manager::PasswordStore> password_store_;
// The task runner for the |web_data_service_|, if any.
- scoped_refptr<base::SingleThreadTaskRunner> web_data_service_thread_;
+ scoped_refptr<base::SequencedTaskRunner> web_data_service_thread_;
// Generates and monitors the ExtensionsActivity object used by sync.
ExtensionsActivityMonitor extensions_activity_monitor_;
diff --git a/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.cc b/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.cc
index caeb3e4..9b34a82 100644
--- a/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.cc
+++ b/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.cc
@@ -21,7 +21,7 @@
AutofillWalletDataTypeController::AutofillWalletDataTypeController(
syncer::ModelType type,
- scoped_refptr<base::SingleThreadTaskRunner> db_thread,
+ scoped_refptr<base::SequencedTaskRunner> db_thread,
const base::RepeatingClosure& dump_stack,
syncer::SyncService* sync_service,
syncer::SyncClient* sync_client,
diff --git a/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.h b/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.h
index af98486..283552a 100644
--- a/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.h
+++ b/components/autofill/core/browser/payments/autofill_wallet_data_type_controller.h
@@ -7,7 +7,7 @@
#include "base/callback.h"
#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
+#include "base/sequenced_task_runner.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/sync/driver/async_directory_type_controller.h"
@@ -34,7 +34,7 @@
// |dump_stack| is called when an unrecoverable error occurs.
AutofillWalletDataTypeController(
syncer::ModelType type,
- scoped_refptr<base::SingleThreadTaskRunner> db_thread,
+ scoped_refptr<base::SequencedTaskRunner> db_thread,
const base::RepeatingClosure& dump_stack,
syncer::SyncService* sync_service,
syncer::SyncClient* sync_client,
diff --git a/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.cc b/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.cc
index ae89e65..13fb57da 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.cc
+++ b/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.cc
@@ -22,7 +22,7 @@
namespace browser_sync {
AutofillProfileDataTypeController::AutofillProfileDataTypeController(
- scoped_refptr<base::SingleThreadTaskRunner> db_thread,
+ scoped_refptr<base::SequencedTaskRunner> db_thread,
const base::Closure& dump_stack,
syncer::SyncService* sync_service,
syncer::SyncClient* sync_client,
diff --git a/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h b/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h
index 4641b0d2..c9079ba 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h
+++ b/components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/scoped_observer.h"
-#include "base/single_thread_task_runner.h"
+#include "base/sequenced_task_runner.h"
#include "components/autofill/core/browser/personal_data_manager_observer.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/sync/driver/async_directory_type_controller.h"
@@ -37,7 +37,7 @@
// |dump_stack| is called when an unrecoverable error occurs.
AutofillProfileDataTypeController(
- scoped_refptr<base::SingleThreadTaskRunner> db_thread,
+ scoped_refptr<base::SequencedTaskRunner> db_thread,
const base::Closure& dump_stack,
syncer::SyncService* sync_service,
syncer::SyncClient* sync_client,
diff --git a/components/browser_sync/profile_sync_components_factory_impl.cc b/components/browser_sync/profile_sync_components_factory_impl.cc
index c669f35..8ea99da 100644
--- a/components/browser_sync/profile_sync_components_factory_impl.cc
+++ b/components/browser_sync/profile_sync_components_factory_impl.cc
@@ -109,8 +109,8 @@
browser_sync::BrowserSyncClient* sync_client,
version_info::Channel channel,
const char* history_disabled_pref,
- const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
- const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
+ const scoped_refptr<base::SequencedTaskRunner>& ui_thread,
+ const scoped_refptr<base::SequencedTaskRunner>& db_thread,
const scoped_refptr<autofill::AutofillWebDataService>&
web_data_service_on_disk,
const scoped_refptr<autofill::AutofillWebDataService>&
diff --git a/components/browser_sync/profile_sync_components_factory_impl.h b/components/browser_sync/profile_sync_components_factory_impl.h
index c68ccd1..c92badf 100644
--- a/components/browser_sync/profile_sync_components_factory_impl.h
+++ b/components/browser_sync/profile_sync_components_factory_impl.h
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "base/single_thread_task_runner.h"
+#include "base/sequenced_task_runner.h"
#include "components/sync/base/model_type.h"
#include "components/sync/driver/sync_api_component_factory.h"
#include "components/version_info/version_info.h"
@@ -45,8 +45,8 @@
BrowserSyncClient* sync_client,
version_info::Channel channel,
const char* history_disabled_pref,
- const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
- const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
+ const scoped_refptr<base::SequencedTaskRunner>& ui_thread,
+ const scoped_refptr<base::SequencedTaskRunner>& db_thread,
const scoped_refptr<autofill::AutofillWebDataService>&
web_data_service_on_disk,
const scoped_refptr<autofill::AutofillWebDataService>&
@@ -112,8 +112,8 @@
BrowserSyncClient* const sync_client_;
const version_info::Channel channel_;
const char* history_disabled_pref_;
- const scoped_refptr<base::SingleThreadTaskRunner> ui_thread_;
- const scoped_refptr<base::SingleThreadTaskRunner> db_thread_;
+ const scoped_refptr<base::SequencedTaskRunner> ui_thread_;
+ const scoped_refptr<base::SequencedTaskRunner> db_thread_;
const scoped_refptr<autofill::AutofillWebDataService>
web_data_service_on_disk_;
const scoped_refptr<autofill::AutofillWebDataService>
