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

chrome/browser/sync/test/integration/updated_progress_marker_checker.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/updated_progress_marker_checker.h"
 
-#include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
 
 UpdatedProgressMarkerChecker::UpdatedProgressMarkerChecker(
     ProfileSyncService* service) : SingleClientStatusChangeChecker(service) {}
 
 UpdatedProgressMarkerChecker::~UpdatedProgressMarkerChecker() {}
 
 bool UpdatedProgressMarkerChecker::IsExitConditionSatisfied() {
   // Checks to see if our self-notify sync cycle has completed and
   // there's nothing to commit.
@@ skipping 18 matching lines @@
   // ProfileSyncService.  If we're calling this right after the sync session
   // completes, then the snapshot is much more likely to be up to date.
   const syncer::SyncCycleSnapshot& snap = service()->GetLastCycleSnapshot();
   return snap.model_neutral_state().num_successful_commits == 0 &&
          service()->IsSyncActive() && !service()->HasUnsyncedItems();
 }
 
 std::string UpdatedProgressMarkerChecker::GetDebugMessage() const {
   return "Waiting for progress markers";
 }