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
deleted file mode 100644
index 6b234e999f1379f79b8576aa688545407a762f73..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/engine/syncer_thread_adapter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.
-#ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_THREAD_ADAPTER_H_
-#define CHROME_BROWSER_SYNC_ENGINE_SYNCER_THREAD_ADAPTER_H_
-#pragma once
-
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#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"
-
-namespace browser_sync {
-
-class SyncerThreadAdapter {
- public:
-  SyncerThreadAdapter(sessions::SyncSessionContext* context,
-                      bool using_new_impl);
-  ~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,
-                   const tracked_objects::Location& nudge_location);
-  void NudgeSyncerWithDataTypes(
-      int milliseconds_from_now,
-      SyncerThread::NudgeSource source,
-      const syncable::ModelTypeBitSet& model_types,
-      const tracked_objects::Location& nudge_location);
-  void NudgeSyncerWithPayloads(
-      int milliseconds_from_now,
-      SyncerThread::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();
- private:
-  scoped_refptr<SyncerThread> legacy_;
-  scoped_ptr<s3::SyncerThread> new_impl_;
-  bool using_new_impl_;
-
-  DISALLOW_COPY_AND_ASSIGN(SyncerThreadAdapter);
-};
-
-}  //  namespace browser_sync
-
-#endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCER_THREAD_ADAPTER_H_