Avoid SYNC_CYCLE_CONTINUATION sync cycles

chrome/browser/sync/profile_sync_service_harness.cc

 // Copyright (c) 2011 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/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 635 matching lines @@
       }
     }
     AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs,
                                  "Wait for migration to finish");
     if (wait_state_ != WAITING_FOR_NOTHING) {
       DVLOG(1) << profile_debug_name_
                << ": wait state = " << wait_state_
                << " after migration finish is not WAITING_FOR_NOTHING";
       return false;
     }
-    if (!AwaitFullSyncCompletion(
+    // We must use AwaitDataSyncCompletion rather than the more common
+    // AwaitFullSyncCompletion.  As long as crbug.com/97780 is open, we will
+    // rely on self-notifications to ensure that timestamps are udpated, which
+    // allows AwaitFullSyncCompletion to return.  However, in some migration
+    // tests these notifications are completely disabled, so the timestamps do
+    // not get updated.  This is why we must use the less strict condition,
+    // AwaitDataSyncCompletion.
+    if (!AwaitDataSyncCompletion(
             "Config sync cycle after migration cycle")) {
       return false;
     }
   }
 }
 
 bool ProfileSyncServiceHarness::AwaitMutualSyncCycleCompletion(
     ProfileSyncServiceHarness* partner) {
   DVLOG(1) << GetClientInfoString("AwaitMutualSyncCycleCompletion");
   if (!AwaitFullSyncCompletion("Sync cycle completion on active client."))
@@ skipping 216 matching lines @@
       service()->GetPreferredDataTypes();
   if (synced_datatypes.Has(datatype)) {
     DVLOG(1) << "EnableSyncForDatatype(): Sync already enabled for datatype "
              << syncable::ModelTypeToString(datatype)
              << " on " << profile_debug_name_ << ".";
     return true;
   }
 
   synced_datatypes.Put(syncable::ModelTypeFromInt(datatype));
   service()->OnUserChoseDatatypes(false, synced_datatypes);
-  if (AwaitFullSyncCompletion("Datatype configuration.")) {
+  if (AwaitDataSyncCompletion("Datatype configuration.")) {
     DVLOG(1) << "EnableSyncForDatatype(): Enabled sync for datatype "
              << syncable::ModelTypeToString(datatype)
              << " on " << profile_debug_name_ << ".";
     return true;
   }
 
   DVLOG(0) << GetClientInfoString("EnableSyncForDatatype failed");
   return false;
 }
 
@@ skipping 182 matching lines @@
   return service_->GetPreferredDataTypes().Has(type);
 }
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::Write(&value, true, &service_status);
   return service_status;
 }