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

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

 // Copyright 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 "chrome/browser/sync/test/integration/migration_watcher.h"
 
 #include "chrome/browser/sync/test/integration/migration_waiter.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
-#include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/browser_sync/profile_sync_service.h"
 
 MigrationWatcher::MigrationWatcher(ProfileSyncServiceHarness* harness)
     : harness_(harness), migration_waiter_(NULL) {
   browser_sync::BackendMigrator* migrator =
       harness_->service()->GetBackendMigratorForTest();
   // PSS must have a migrator after sync is setup and initial data type
   // configuration is complete.
   migrator->AddMigrationObserver(this);
 }
 
@@ skipping 37 matching lines @@
 
 void MigrationWatcher::set_migration_waiter(MigrationWaiter* waiter) {
   DCHECK(!migration_waiter_);
   migration_waiter_ = waiter;
 }
 
 void MigrationWatcher::clear_migration_waiter() {
   DCHECK(migration_waiter_);
   migration_waiter_ = NULL;
 }