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

chrome/browser/sync/test/integration/sync_integration_test_util.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/sync_integration_test_util.h"
 
 #include <string>
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/sync/test/integration/fake_server_match_status_checker.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"
-#include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/browser_sync/profile_sync_service.h"
 
 namespace {
 
 // Helper class to block until the server has a given number of entities.
 class ServerCountMatchStatusChecker
     : public fake_server::FakeServerMatchStatusChecker {
  public:
   ServerCountMatchStatusChecker(syncer::ModelType type, size_t count)
       : type_(type), count_(count) {}
   ~ServerCountMatchStatusChecker() override {}
@@ skipping 62 matching lines @@
   return !checker.TimedOut();
 }
 
 bool AwaitServerCount(syncer::ModelType type, size_t count) {
   ServerCountMatchStatusChecker checker(type, count);
   checker.Wait();
   return !checker.TimedOut();
 }
 
 }  // namespace sync_integration_test_util