diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 18:54:03 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 18:54:03 +0000 |
| commit | a76bf96db2cb5aef56de46860630da6a0a6c2477 (patch) | |
| tree | c33b548b166d92b1168220bb32d058d23818e42a /chrome/browser/sync/engine | |
| parent | 6d1fe886978abb15f41c4946049d2cd42b0cb470 (diff) | |
| download | chromium_src-a76bf96db2cb5aef56de46860630da6a0a6c2477.zip chromium_src-a76bf96db2cb5aef56de46860630da6a0a6c2477.tar.gz chromium_src-a76bf96db2cb5aef56de46860630da6a0a6c2477.tar.bz2 | |
Add GROUP_FILE ModelSafeGroup
Original patch by kalman@chromium.org
BUG=
TEST=Added FileModelWorkerUnittest
TBR=kalman@chromium.org
Review URL: http://codereview.chromium.org/7908010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine')
4 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/sync/engine/mock_model_safe_workers.cc b/chrome/browser/sync/engine/mock_model_safe_workers.cc index 8e121af..44aebdd 100644 --- a/chrome/browser/sync/engine/mock_model_safe_workers.cc +++ b/chrome/browser/sync/engine/mock_model_safe_workers.cc @@ -10,6 +10,8 @@ ModelSafeGroup MockUIModelWorker::GetModelSafeGroup() { return GROUP_UI; } ModelSafeGroup MockDBModelWorker::GetModelSafeGroup() { return GROUP_DB; } +ModelSafeGroup MockFileModelWorker::GetModelSafeGroup() { return GROUP_FILE; } + MockModelSafeWorkerRegistrar::~MockModelSafeWorkerRegistrar() {} // static diff --git a/chrome/browser/sync/engine/mock_model_safe_workers.h b/chrome/browser/sync/engine/mock_model_safe_workers.h index e5526cf..efe2a1e 100644 --- a/chrome/browser/sync/engine/mock_model_safe_workers.h +++ b/chrome/browser/sync/engine/mock_model_safe_workers.h @@ -24,6 +24,11 @@ class MockDBModelWorker : public ModelSafeWorker { virtual ModelSafeGroup GetModelSafeGroup(); }; +class MockFileModelWorker : public ModelSafeWorker { + public: + virtual ModelSafeGroup GetModelSafeGroup(); +}; + class MockModelSafeWorkerRegistrar : public ModelSafeWorkerRegistrar { public: virtual ~MockModelSafeWorkerRegistrar(); diff --git a/chrome/browser/sync/engine/model_safe_worker.cc b/chrome/browser/sync/engine/model_safe_worker.cc index d879bb2..8142be2 100644 --- a/chrome/browser/sync/engine/model_safe_worker.cc +++ b/chrome/browser/sync/engine/model_safe_worker.cc @@ -59,6 +59,8 @@ std::string ModelSafeGroupToString(ModelSafeGroup group) { return "GROUP_UI"; case GROUP_DB: return "GROUP_DB"; + case GROUP_FILE: + return "GROUP_FILE"; case GROUP_HISTORY: return "GROUP_HISTORY"; case GROUP_PASSIVE: diff --git a/chrome/browser/sync/engine/model_safe_worker.h b/chrome/browser/sync/engine/model_safe_worker.h index 4b8e4e7..f4829ec 100644 --- a/chrome/browser/sync/engine/model_safe_worker.h +++ b/chrome/browser/sync/engine/model_safe_worker.h @@ -26,6 +26,7 @@ enum ModelSafeGroup { // native model. GROUP_UI, // Models that live on UI thread and are being synced. GROUP_DB, // Models that live on DB thread and are being synced. + GROUP_FILE, // Models that live on FILE thread and are being synced. GROUP_HISTORY, // Models that live on history thread and are being // synced. GROUP_PASSWORD, // Models that live on the password thread and are |