make new syncer thread the default.

chrome/browser/sync/engine/syncer_thread2_whitebox_unittest.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/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"
 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace browser_sync {
 using sessions::SyncSessionContext;
 using browser_sync::Syncer;
 
-namespace s3 {
-
 class SyncerThread2WhiteboxTest : public testing::Test {
  public:
   virtual void SetUp() {
     syncdb_.SetUp();
     Syncer* syncer = new Syncer();
     registrar_.reset(MockModelSafeWorkerRegistrar::PassiveBookmarks());
     context_ = new SyncSessionContext(connection_.get(), syncdb_.manager(),
         registrar_.get(), std::vector<SyncEngineEventListener*>());
     context_->set_notifications_enabled(true);
     context_->set_account_name("Test");
@@ skipping 185 matching lines @@
 
   struct SyncerThread::SyncSessionJob job;
   job.purpose = SyncerThread::SyncSessionJob::CONFIGURATION;
   job.scheduled_start = TimeTicks::Now();
   job.is_canary_job = true;
   SyncerThread::JobProcessDecision decision = DecideOnJob(job);
 
   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);