make new syncer thread the default.

chrome/browser/sync/engine/syncer_thread2_whitebox_unittest.cc

Index: chrome/browser/sync/engine/syncer_thread2_whitebox_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_thread2_whitebox_unittest.cc b/chrome/browser/sync/engine/syncer_thread2_whitebox_unittest.cc
index e1d1218c5ce2cccd7c86cac7e8c2ddda6f547da9..e041aaa959ce8961f6da44834fb760a01934bf72 100644
--- a/chrome/browser/sync/engine/syncer_thread2_whitebox_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_thread2_whitebox_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/time.h"
 #include "chrome/browser/sync/engine/mock_model_safe_workers.h"
-#include "chrome/browser/sync/engine/syncer_thread2.h"
+#include "chrome/browser/sync/engine/syncer_thread.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
 #include "chrome/browser/sync/sessions/test_util.h"
 #include "chrome/test/sync/engine/mock_connection_manager.h"
@@ -19,8 +19,6 @@ namespace browser_sync {
 using sessions::SyncSessionContext;
 using browser_sync::Syncer;
 
-namespace s3 {
-
 class SyncerThread2WhiteboxTest : public testing::Test {
  public:
   virtual void SetUp() {
@@ -226,10 +224,8 @@ TEST_F(SyncerThread2WhiteboxTest, ContinueCanaryJobConfig) {
   EXPECT_EQ(decision, SyncerThread::CONTINUE);
 }
 
-
-}  // namespace s3
 }  // namespace browser_sync
 
 // SyncerThread won't outlive the test!
 DISABLE_RUNNABLE_METHOD_REFCOUNT(
-    browser_sync::s3::SyncerThread2WhiteboxTest);
+    browser_sync::SyncerThread2WhiteboxTest);