[Sync] Merge //components/browser_sync into one directory.

chrome/browser/sync/test/integration/single_client_directory_sync_test.cc

 // Copyright (c) 2014 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/location.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/test/directory_backing_store_corruption_testing.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using sync_integration_test_util::AwaitCommitActivityCompletion;
 using syncer::syncable::corruption_testing::kNumEntriesRequiredForCorruption;
 using syncer::syncable::corruption_testing::CorruptDatabase;
 
@@ skipping 103 matching lines @@
   SyncUnrecoverableErrorChecker checker(sync_service);
   checker.Wait();
   ASSERT_TRUE(!checker.TimedOut());
   ASSERT_TRUE(sync_service->HasUnrecoverableError());
 
   // Wait until the sync loop has processed any existing tasks and see that the
   // directory no longer exists.
   ASSERT_TRUE(WaitForExistingTasksOnLoop(sync_loop));
   ASSERT_FALSE(base::DirectoryExists(directory_path));
 }