[Sync] Make ModelSafeWorker a true interface

chrome/browser/sync/sessions/sync_session_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sessions/sync_session.h"
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
-#include "chrome/browser/sync/engine/mock_model_safe_workers.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/test/engine/fake_model_worker.h"
 #include "chrome/browser/sync/test/engine/test_directory_setter_upper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using syncable::WriteTransaction;
 
 namespace browser_sync {
 namespace sessions {
 namespace {
 
 class SyncSessionTest : public testing::Test,
@@ skipping 254 matching lines @@
       syncable::ModelTypePayloadMapFromBitSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
   syncable::ModelTypePayloadMap all_types =
       syncable::ModelTypePayloadMapFromBitSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
   SyncSourceInfo source_two(sync_pb::GetUpdatesCallerInfo::LOCAL, all_types);
 
-  scoped_refptr<MockDBModelWorker> db_worker(new MockDBModelWorker());
-  scoped_refptr<MockUIModelWorker> ui_worker(new MockUIModelWorker());
+  scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
+  scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
   workers_one.push_back(db_worker);
   workers_two.push_back(db_worker);
   workers_two.push_back(ui_worker);
   routes_one[syncable::AUTOFILL] = GROUP_DB;
   routes_two[syncable::AUTOFILL] = GROUP_DB;
   routes_two[syncable::BOOKMARKS] = GROUP_UI;
   SyncSession one(context_.get(), this, source_one, routes_one, workers_one);
   SyncSession two(context_.get(), this, source_two, routes_two, workers_two);
 
   one.Coalesce(two);
@@ skipping 16 matching lines @@
       syncable::ModelTypePayloadMapFromBitSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
   syncable::ModelTypePayloadMap all_types =
       syncable::ModelTypePayloadMapFromBitSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
   SyncSourceInfo source_two(sync_pb::GetUpdatesCallerInfo::LOCAL, all_types);
 
-  scoped_refptr<MockDBModelWorker> db_worker(new MockDBModelWorker());
-  scoped_refptr<MockUIModelWorker> ui_worker(new MockUIModelWorker());
+  scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
+  scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
   workers_one.push_back(db_worker);
   workers_two.push_back(db_worker);
   workers_two.push_back(ui_worker);
   routes_one[syncable::AUTOFILL] = GROUP_DB;
   routes_two[syncable::AUTOFILL] = GROUP_UI;
   routes_two[syncable::BOOKMARKS] = GROUP_UI;
   SyncSession one(context_.get(), this, source_one, routes_one, workers_one);
   SyncSession two(context_.get(), this, source_two, routes_two, workers_two);
 
   two.RebaseRoutingInfoWithLatest(&one);
@@ skipping 27 matching lines @@
   ModelSafeRoutingInfo routes_first, routes_second;
   syncable::ModelTypePayloadMap all_types =
       syncable::ModelTypePayloadMapFromBitSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_first(sync_pb::GetUpdatesCallerInfo::PERIODIC,
       all_types);
   SyncSourceInfo source_second(sync_pb::GetUpdatesCallerInfo::LOCAL,
       all_types);
 
-  scoped_refptr<MockDBModelWorker> db_worker(new MockDBModelWorker());
-  scoped_refptr<MockUIModelWorker> ui_worker(new MockUIModelWorker());
+  scoped_refptr<FakeModelWorker> db_worker(new FakeModelWorker(GROUP_DB));
+  scoped_refptr<FakeModelWorker> ui_worker(new FakeModelWorker(GROUP_UI));
   workers_first.push_back(db_worker);
   workers_first.push_back(ui_worker);
   workers_second.push_back(db_worker);
   workers_second.push_back(ui_worker);
   routes_first[syncable::AUTOFILL] = GROUP_DB;
   routes_first[syncable::BOOKMARKS] = GROUP_UI;
   routes_second[syncable::AUTOFILL] = GROUP_DB;
   routes_second[syncable::BOOKMARKS] = GROUP_UI;
   SyncSession first(context_.get(), this, source_first, routes_first,
       workers_first);
@@ skipping 88 matching lines @@
   EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);
   EXPECT_EQ(payload1, original[syncable::PASSWORDS]);
   EXPECT_EQ(payload1, original[syncable::AUTOFILL]);
   EXPECT_EQ(payload2, original[syncable::SESSIONS]);
   EXPECT_EQ(payload3, original[syncable::THEMES]);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync