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

Unified Diff: chrome/browser/sync/glue/sync_backend_registrar.cc

Issue 7891054: Add GROUP_FILE ModelSafeGroup (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix worker count in unittest Created 9 years, 3 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/glue/sync_backend_registrar.cc
diff --git a/chrome/browser/sync/glue/sync_backend_registrar.cc b/chrome/browser/sync/glue/sync_backend_registrar.cc
index 376ab5bf64013845112511cab0eec7c1d3b769c5..5edf2b7e2435ffaebb9dbc77625e84b15a746f35 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar.cc
@@ -11,7 +11,7 @@
#include "base/message_loop.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/glue/change_processor.h"
-#include "chrome/browser/sync/glue/database_model_worker.h"
+#include "chrome/browser/sync/glue/browser_thread_model_worker.h"
#include "chrome/browser/sync/glue/history_model_worker.h"
#include "chrome/browser/sync/glue/password_model_worker.h"
#include "chrome/browser/sync/glue/ui_model_worker.h"
@@ -31,6 +31,8 @@ bool IsOnThreadForGroup(ModelSafeGroup group) {
return BrowserThread::CurrentlyOn(BrowserThread::UI);
case GROUP_DB:
return BrowserThread::CurrentlyOn(BrowserThread::DB);
+ case GROUP_FILE:
+ return BrowserThread::CurrentlyOn(BrowserThread::FILE);
case GROUP_HISTORY:
// TODO(ncarter): How to determine this?
return true;
@@ -57,7 +59,10 @@ SyncBackendRegistrar::SyncBackendRegistrar(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
CHECK(profile_);
DCHECK(sync_loop_);
- workers_[GROUP_DB] = new DatabaseModelWorker();
+ workers_[GROUP_DB] =
+ new BrowserThreadModelWorker(BrowserThread::DB, GROUP_DB);
+ workers_[GROUP_FILE] =
+ new BrowserThreadModelWorker(BrowserThread::FILE, GROUP_FILE);
workers_[GROUP_UI] = ui_worker_;
workers_[GROUP_PASSIVE] = new ModelSafeWorker();

Powered by Google App Engine
This is Rietveld 408576698