[Sync] Make ModelSafeWorker a true interface

chrome/browser/sync/engine/download_updates_command_unittest.cc

Index: chrome/browser/sync/engine/download_updates_command_unittest.cc
diff --git a/chrome/browser/sync/engine/download_updates_command_unittest.cc b/chrome/browser/sync/engine/download_updates_command_unittest.cc
index 53d6bf72d39eacc7d95e3e3152c69c63740904c6..3e75d437c582dffb9f094b80e2fe558d1d009cbe 100644
--- a/chrome/browser/sync/engine/download_updates_command_unittest.cc
+++ b/chrome/browser/sync/engine/download_updates_command_unittest.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
+#include "chrome/browser/sync/test/engine/fake_model_worker.h"
 #include "chrome/browser/sync/test/engine/proto_extension_validator.h"
 #include "chrome/browser/sync/test/engine/syncer_command_test.h"
 
@@ -25,19 +26,18 @@ class DownloadUpdatesCommandTest : public SyncerCommandTest {
   virtual void SetUp() {
     workers()->clear();
     mutable_routing_info()->clear();
-    // GROUP_PASSIVE worker.
-    workers()->push_back(make_scoped_refptr(new ModelSafeWorker()));
+    workers()->push_back(
+        make_scoped_refptr(new FakeModelWorker(GROUP_DB)));
+    workers()->push_back(
+        make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
+    (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_DB;
+    (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;
+    (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI;
     SyncerCommandTest::SetUp();
   }
 
-  virtual void SetRoutingInfo(const syncable::ModelTypeSet& types) {
-    for (syncable::ModelTypeSet::const_iterator iter = types.begin();
-         iter != types.end(); ++iter) {
-      (*mutable_routing_info())[*iter] = GROUP_PASSIVE;
-    }
-  }
-
   DownloadUpdatesCommand command_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadUpdatesCommandTest);
 };
@@ -106,29 +106,19 @@ TEST_F(DownloadUpdatesCommandTest, SetRequestedTypes) {
 
 TEST_F(DownloadUpdatesCommandTest, ExecuteNoPayloads) {
   ConfigureMockServerConnection();
-
-  syncable::ModelTypeSet types;
-  types.insert(syncable::AUTOFILL);
-  types.insert(syncable::BOOKMARKS);
-  types.insert(syncable::PREFERENCES);
-  SetRoutingInfo(types);
-  mock_server()->ExpectGetUpdatesRequestTypes(ModelTypeBitSetFromSet(types));
+  mock_server()->ExpectGetUpdatesRequestTypes(
+      ModelTypeBitSetFromSet(GetRoutingInfoTypes(routing_info())));
   command_.ExecuteImpl(session());
 }
 
 TEST_F(DownloadUpdatesCommandTest, ExecuteWithPayloads) {
   ConfigureMockServerConnection();
-
-  syncable::ModelTypeSet types;
-  types.insert(syncable::AUTOFILL);
-  types.insert(syncable::BOOKMARKS);
-  types.insert(syncable::PREFERENCES);
-  SetRoutingInfo(types);
   sessions::SyncSourceInfo source;
   source.types[syncable::AUTOFILL] = "autofill_payload";
   source.types[syncable::BOOKMARKS] = "bookmark_payload";
   source.types[syncable::PREFERENCES] = "preferences_payload";
-  mock_server()->ExpectGetUpdatesRequestTypes(ModelTypeBitSetFromSet(types));
+  mock_server()->ExpectGetUpdatesRequestTypes(
+      ModelTypeBitSetFromSet(GetRoutingInfoTypes(routing_info())));
   mock_server()->ExpectGetUpdatesRequestPayloads(source.types);
   command_.ExecuteImpl(session(source));
 }