| Index: chrome/browser/sync/engine/syncer_thread2_unittest.cc
|
| diff --git a/chrome/browser/sync/engine/syncer_thread2_unittest.cc b/chrome/browser/sync/engine/syncer_thread2_unittest.cc
|
| index 2823567a83bf7348dd08d152f789d10fa9b30218..d231a0699036ea689533156adba5a9e20a650339 100644
|
| --- a/chrome/browser/sync/engine/syncer_thread2_unittest.cc
|
| +++ b/chrome/browser/sync/engine/syncer_thread2_unittest.cc
|
| @@ -6,7 +6,7 @@
|
| #include "base/test/test_timeouts.h"
|
| #include "chrome/browser/sync/engine/mock_model_safe_workers.h"
|
| #include "chrome/browser/sync/engine/syncer.h"
|
| -#include "chrome/browser/sync/engine/syncer_thread2.h"
|
| +#include "chrome/browser/sync/engine/syncer_thread.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"
|
| @@ -37,8 +37,6 @@ class MockSyncer : public Syncer {
|
| SyncerStep));
|
| };
|
|
|
| -namespace s3 {
|
| -
|
| // Used when tests want to record syncing activity to examine later.
|
| struct SyncShareRecords {
|
| std::vector<TimeTicks> times;
|
| @@ -929,8 +927,7 @@ TEST_F(SyncerThread2Test, SetsPreviousRoutingInfo) {
|
| EXPECT_TRUE(expected == context()->previous_session_routing_info());
|
| }
|
|
|
| -} // namespace s3
|
| } // namespace browser_sync
|
|
|
| // SyncerThread won't outlive the test!
|
| -DISABLE_RUNNABLE_METHOD_REFCOUNT(browser_sync::s3::SyncerThread2Test);
|
| +DISABLE_RUNNABLE_METHOD_REFCOUNT(browser_sync::SyncerThread2Test);
|
|
|