Sync: fix for the code that checks whether the initial download has completed

sync/engine/apply_control_data_updates.cc

 // Copyright 2012 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 "sync/engine/apply_control_data_updates.h"
 
 #include "base/metrics/histogram.h"
 #include "sync/engine/conflict_resolver.h"
 #include "sync/engine/conflict_util.h"
 #include "sync/engine/syncer_util.h"
@@ skipping 14 matching lines @@
       &trans, ToFullModelTypeSet(ControlTypes()), &handles);
 
   // First, go through and manually apply any new top level datatype nodes (so
   // that we don't have to worry about hitting a CONFLICT_HIERARCHY with an
   // entry because we haven't applied its parent yet).
   // TODO(sync): if at some point we support control datatypes with actual
   // hierarchies we'll need to revisit this logic.
   ModelTypeSet control_types = ControlTypes();
   for (ModelTypeSet::Iterator iter = control_types.First(); iter.Good();
        iter.Inc()) {
-    syncable::MutableEntry entry(&trans, syncable::GET_TYPE_ROOT, iter.Get());
+    ModelType type = iter.Get();
+    syncable::MutableEntry entry(&trans, syncable::GET_TYPE_ROOT, type);
     if (!entry.good())
       continue;
-    if (!entry.GetIsUnappliedUpdate())
+
+    if (!entry.GetIsUnappliedUpdate()) {
+      // If this is a type with client generated root, the root node has been
+      // created locally and might never be updated by the server. In that case
+      // it has to be marked as having the initial download completed (which is
+      // done by changing the root's base version to a value other than
+      // CHANGES_VERSION). This does nothing if the root's base version is
+      // already other than CHANGES_VERSION.
+      if (IsTypeWithClientGeneratedRoot(type)) {
+        dir->MarkInitialSyncEndedForType(&trans, type);
+      }
       continue;
+    }
 
-    ModelType type = entry.GetServerModelType();
+    DCHECK_EQ(type, entry.GetServerModelType());
     if (type == NIGORI) {
       // Nigori node applications never fail.
       ApplyNigoriUpdate(&trans,
                         &entry,
                         dir->GetCryptographer(&trans));
     } else {
       ApplyControlUpdate(&trans,
                          &entry,
                          dir->GetCryptographer(&trans));
     }
@@ skipping 151 matching lines @@
                               ConflictResolver::OVERWRITE_LOCAL,
                               ConflictResolver::CONFLICT_RESOLUTION_SIZE);
   }
 
   UpdateAttemptResponse response = AttemptToUpdateEntry(
       trans, entry, cryptographer);
   DCHECK_EQ(SUCCESS, response);
 }
 
 }  // namespace syncer