make new syncer thread the default.

chrome/browser/sync/engine/syncer_thread_adapter.cc

Index: chrome/browser/sync/engine/syncer_thread_adapter.cc
diff --git a/chrome/browser/sync/engine/syncer_thread_adapter.cc b/chrome/browser/sync/engine/syncer_thread_adapter.cc
index 8a513e91e2858b28ace5b4bad722f4309716e16e..05e7cb62a0dd8282fdd6d5619bd35e641682d44d 100644
--- a/chrome/browser/sync/engine/syncer_thread_adapter.cc
+++ b/chrome/browser/sync/engine/syncer_thread_adapter.cc
@@ -12,136 +12,66 @@ 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()));
-  } else {
-    legacy_ = new SyncerThread(context);
-  }
+SyncerThreadAdapter::SyncerThreadAdapter(sessions::SyncSessionContext* context)
+    : new_impl_(NULL) {
+  new_impl_.reset(new SyncerThread(context, new Syncer()));
 }
 
 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, NULL);
-    return true;
-  } else {
-    return legacy_->Start();
-  }
+  new_impl_->Start(SyncerThread::NORMAL_MODE, NULL);
+  return true;
 }
 
 bool SyncerThreadAdapter::Stop(int max_wait) {
-  if (using_new_impl_) {
-    new_impl_->Stop();
-    return true;
-  } else {
-    return legacy_->Stop(max_wait);
-  }
-}
-
-bool SyncerThreadAdapter::RequestPause() {
-  DCHECK(!using_new_impl_);
-  return legacy_->RequestPause();
-}
-
-bool SyncerThreadAdapter::RequestResume() {
-  DCHECK(!using_new_impl_);
-  return legacy_->RequestResume();
-}
-
-s3::NudgeSource LegacyToNewSyncerThreadSource(SyncerThread::NudgeSource s) {
-  switch (s) {
-    case SyncerThread::kNotification:
-      return s3::NUDGE_SOURCE_NOTIFICATION;
-    case SyncerThread::kContinuation:
-      return s3::NUDGE_SOURCE_CONTINUATION;
-    case SyncerThread::kLocal:
-      return s3::NUDGE_SOURCE_LOCAL;
-    case SyncerThread::kUnknown:
-      return s3::NUDGE_SOURCE_UNKNOWN;
-    default:
-      NOTREACHED();
-      return s3::NUDGE_SOURCE_UNKNOWN;
-  }
+  new_impl_->Stop();
+  return true;
 }
 
 void SyncerThreadAdapter::NudgeSyncer(int milliseconds_from_now,
-    SyncerThread::NudgeSource source,
+    NudgeSource source,
     const tracked_objects::Location& nudge_location) {
-  if (using_new_impl_) {
-    if (source == SyncerThread::kClearPrivateData) {
-      new_impl_->ScheduleClearUserData();
-      return;
-    }
-    new_impl_->ScheduleNudge(
-        TimeDelta::FromMilliseconds(milliseconds_from_now),
-        LegacyToNewSyncerThreadSource(source), ModelTypeBitSet(),
-        nudge_location);
-  } else {
-    legacy_->NudgeSyncer(milliseconds_from_now, source);
+  if (source == CLEAR_USER_PRIVATE_DATA) {
+    new_impl_->ScheduleClearUserData();
+    return;
   }
+  new_impl_->ScheduleNudge(
+      TimeDelta::FromMilliseconds(milliseconds_from_now),
+      source, ModelTypeBitSet(),
+      nudge_location);
 }
 
 void SyncerThreadAdapter::NudgeSyncerWithDataTypes(
       int milliseconds_from_now,
-      SyncerThread::NudgeSource source,
+      NudgeSource source,
       const syncable::ModelTypeBitSet& model_types,
       const tracked_objects::Location& nudge_location) {
-  DCHECK_NE(SyncerThread::kClearPrivateData, source);
-  if (using_new_impl_) {
-    new_impl_->ScheduleNudge(
-        TimeDelta::FromMilliseconds(milliseconds_from_now),
-        LegacyToNewSyncerThreadSource(source), model_types,
-        nudge_location);
-  } else {
-    legacy_->NudgeSyncerWithDataTypes(milliseconds_from_now, source,
-        model_types);
-  }
+  DCHECK_NE(CLEAR_USER_PRIVATE_DATA, source);
+  new_impl_->ScheduleNudge(
+      TimeDelta::FromMilliseconds(milliseconds_from_now),
+      source, model_types,
+      nudge_location);
 }
 
 void SyncerThreadAdapter::NudgeSyncerWithPayloads(
       int milliseconds_from_now,
-      SyncerThread::NudgeSource source,
+      NudgeSource source,
       const syncable::ModelTypePayloadMap& model_types_with_payloads,
       const tracked_objects::Location& nudge_location) {
-  DCHECK_NE(SyncerThread::kClearPrivateData, source);
-  if (using_new_impl_) {
-    new_impl_->ScheduleNudgeWithPayloads(
-        TimeDelta::FromMilliseconds(milliseconds_from_now),
-        LegacyToNewSyncerThreadSource(source), model_types_with_payloads,
-        nudge_location);
-  } else {
-    legacy_->NudgeSyncerWithPayloads(milliseconds_from_now, source,
-        model_types_with_payloads);
-  }
+  new_impl_->ScheduleNudgeWithPayloads(
+      TimeDelta::FromMilliseconds(milliseconds_from_now),
+      source, model_types_with_payloads,
+      nudge_location);
 }
 
 void SyncerThreadAdapter::SetNotificationsEnabled(bool enabled) {
-  if (using_new_impl_)
-    new_impl_->set_notifications_enabled(enabled);
-  else
-    legacy_->SetNotificationsEnabled(enabled);
-}
-
-void SyncerThreadAdapter::CreateSyncer(const std::string& dirname) {
-  if (!using_new_impl_)
-    legacy_->CreateSyncer(dirname);
-  // No-op if using new impl.
+  new_impl_->set_notifications_enabled(enabled);
 }
 
-s3::SyncerThread* SyncerThreadAdapter::new_impl() {
+SyncerThread* SyncerThreadAdapter::new_impl() {
   return new_impl_.get();
 }