Support for multiple sync ModelSafeWorkers....

chrome/browser/sync/sessions/sync_session_unittest.cc

Index: chrome/browser/sync/sessions/sync_session_unittest.cc
===================================================================
--- chrome/browser/sync/sessions/sync_session_unittest.cc	(revision 36603)
+++ chrome/browser/sync/sessions/sync_session_unittest.cc	(working copy)
@@ -19,11 +19,12 @@
 namespace {
 
 class SyncSessionTest : public testing::Test,
-                        public SyncSession::Delegate {
+                        public SyncSession::Delegate,
+                        public ModelSafeWorkerRegistrar {
  public:
   SyncSessionTest() : controller_invocations_allowed_(false) {}
   virtual void SetUp() {
-    context_.reset(new SyncSessionContext(NULL, NULL, NULL));
+    context_.reset(new SyncSessionContext(NULL, NULL, this));
     session_.reset(new SyncSession(context_.get(), this));
   }
   virtual void TearDown() {
@@ -47,6 +48,10 @@
     FailControllerInvocationIfDisabled("OnReceivedShortPollIntervalUpdate");
   }
 
+  // ModelSafeWorkerRegistrar implementation.
+  virtual void GetWorkers(std::vector<ModelSafeWorker*>* out) {}
+  virtual void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) {}
+
   StatusController* status() { return session_->status_controller(); }
  protected:
   void FailControllerInvocationIfDisabled(const std::string& msg) {
@@ -78,7 +83,7 @@
   TestDirectorySetterUpper db;
   db.SetUp();
   session_.reset(NULL);
-  context_.reset(new SyncSessionContext(NULL, db.manager(), NULL));
+  context_.reset(new SyncSessionContext(NULL, db.manager(), this));
   session_.reset(new SyncSession(context_.get(), this));
   context_->set_account_name(db.name());
   syncable::ScopedDirLookup dir(context_->directory_manager(),