Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(550)

Unified Diff: chrome/browser/sync/chrome_sync_client.cc

Issue 2944993002: Remove dependency on BrowserThread::FILE from Sync code (Closed)
Patch Set: More explicit about returning nullptr ModelSafeWorker for FILE group on Android and iOS Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 4b3cf92dab10631f51bda74c266fbd3782cc232b..923ec316145e80ab7794008532a9951d84764bf6 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
+#include "chrome/browser/extensions/api/storage/backend_task_runner.h"
#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
@@ -536,10 +537,15 @@ ChromeSyncClient::CreateModelWorkerForGroup(syncer::ModelSafeGroup group) {
return new syncer::SequencedModelWorker(
BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
syncer::GROUP_DB);
+ // TODO(stanisc): crbug.com/731903: Rename GROUP_FILE to reflect that it is
+ // used only for app and extension settings.
case syncer::GROUP_FILE:
+#if BUILDFLAG(ENABLE_EXTENSIONS)
return new syncer::SequencedModelWorker(
- BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
- syncer::GROUP_FILE);
+ extensions::GetBackendTaskRunner(), syncer::GROUP_FILE);
+#else
+ return nullptr;
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
case syncer::GROUP_UI:
return new syncer::UIModelWorker(
BrowserThread::GetTaskRunnerForThread(BrowserThread::UI));

Powered by Google App Engine
This is Rietveld 408576698