make new syncer thread the default.

chrome/browser/sync/engine/syncer_thread_adapter.h

Index: chrome/browser/sync/engine/syncer_thread_adapter.h
diff --git a/chrome/browser/sync/engine/syncer_thread_adapter.h b/chrome/browser/sync/engine/syncer_thread_adapter.h
index 6b234e999f1379f79b8576aa688545407a762f73..f2c752ec6995fbe3fb79c1ed068636b377631937 100644
--- a/chrome/browser/sync/engine/syncer_thread_adapter.h
+++ b/chrome/browser/sync/engine/syncer_thread_adapter.h
@@ -10,7 +10,6 @@
 #include "base/tracked.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/syncer_thread.h"
-#include "chrome/browser/sync/engine/syncer_thread2.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
@@ -19,38 +18,30 @@ namespace browser_sync {
 
 class SyncerThreadAdapter {
  public:
-  SyncerThreadAdapter(sessions::SyncSessionContext* context,
-                      bool using_new_impl);
+  explicit SyncerThreadAdapter(sessions::SyncSessionContext* context);

[tim (not reviewing), 2011/04/18 16:11:47]

This class only existed to choose between implementations.  Theres only one now
so it should be removed.

[lipalani1, 2011/04/18 20:36:41]

Done.

   ~SyncerThreadAdapter();
 
-  // We mimic the SyncerThread interface (an adaptee).
-  void WatchConnectionManager(ServerConnectionManager* conn_mgr);
   bool Start();
   bool Stop(int max_wait);
-  bool RequestPause();
-  bool RequestResume();
   void NudgeSyncer(int milliseconds_from_now,
-                   SyncerThread::NudgeSource source,
+                   NudgeSource source,
                    const tracked_objects::Location& nudge_location);
   void NudgeSyncerWithDataTypes(
       int milliseconds_from_now,
-      SyncerThread::NudgeSource source,
+      NudgeSource source,
       const syncable::ModelTypeBitSet& model_types,
       const tracked_objects::Location& nudge_location);
   void NudgeSyncerWithPayloads(
       int milliseconds_from_now,
-      SyncerThread::NudgeSource source,
+      NudgeSource source,
       const syncable::ModelTypePayloadMap& model_types_with_payloads,
       const tracked_objects::Location& nudge_location);
   void SetNotificationsEnabled(bool enabled);
-  void CreateSyncer(const std::string& dirname);
 
   // Expose the new impl to leverage new apis through the adapter.
-  s3::SyncerThread* new_impl();
+  SyncerThread* new_impl();
  private:
-  scoped_refptr<SyncerThread> legacy_;
-  scoped_ptr<s3::SyncerThread> new_impl_;
-  bool using_new_impl_;
+  scoped_ptr<SyncerThread> new_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncerThreadAdapter);
 };