sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends

chrome/browser/sync/engine/syncer_thread_adapter.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 "base/time.h"
 #include "chrome/browser/sync/engine/syncer_thread_adapter.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 
 using base::TimeDelta;
 using syncable::ModelTypeBitSet;
 
 namespace browser_sync {
 
 SyncerThreadAdapter::SyncerThreadAdapter(sessions::SyncSessionContext* context,
                                          bool using_new_impl)
     : legacy_(NULL), new_impl_(NULL), using_new_impl_(using_new_impl) {
   if (using_new_impl_) {
     new_impl_.reset(new s3::SyncerThread(context, new Syncer()));
-    new_impl_->Start(s3::SyncerThread::CONFIGURATION_MODE);
+    new_impl_->Start(s3::SyncerThread::CONFIGURATION_MODE, NULL);
   } else {
     legacy_ = new SyncerThread(context);
   }
 }
 
 SyncerThreadAdapter::~SyncerThreadAdapter() {
   legacy_ = NULL;
   new_impl_.reset();
 }
 
 void SyncerThreadAdapter::WatchConnectionManager(
     ServerConnectionManager* conn_mgr) {
   DCHECK(!using_new_impl_);
   legacy_->WatchConnectionManager(conn_mgr);
 }
 
 bool SyncerThreadAdapter::Start() {
   if (using_new_impl_) {
-    new_impl_->Start(s3::SyncerThread::NORMAL_MODE);
+    new_impl_->Start(s3::SyncerThread::NORMAL_MODE, NULL);
     return true;
   } else {
     return legacy_->Start();
   }
 }
 
 bool SyncerThreadAdapter::Stop(int max_wait) {
   if (using_new_impl_) {
     new_impl_->Stop();
     return true;
@@ skipping 84 matching lines @@
   if (!using_new_impl_)
     legacy_->CreateSyncer(dirname);
   // No-op if using new impl.
 }
 
 s3::SyncerThread* SyncerThreadAdapter::new_impl() {
   return new_impl_.get();
 }
 
 }  // namespace browser_sync