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

sync/engine/apply_control_data_updates_unittest.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 "base/format_macros.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "sync/engine/apply_control_data_updates.h"
@@ skipping 896 matching lines @@
   entry_factory_->SetLocalSpecificsForItem(experiment_handle,
                                            local_specifics);
   ApplyControlDataUpdates(directory());
 
   EXPECT_FALSE(entry_factory_->GetIsUnappliedForItem(experiment_handle));
   EXPECT_TRUE(
       entry_factory_->GetLocalSpecificsForItem(experiment_handle).
           experiments().keystore_encryption().enabled());
 }
 
+// Check that applying a control update marks the datatype as downloaded.
+TEST_F(ApplyControlDataUpdatesTest, ControlApplyMarksDownloadCompleted) {
+  {
+    syncable::WriteTransaction trans(FROM_HERE, UNITTEST, directory());
+    syncable::ModelNeutralMutableEntry entry(
+        &trans, syncable::CREATE_NEW_TYPE_ROOT, EXPERIMENTS);
+    ASSERT_TRUE(entry.good());
+    entry.PutServerIsDir(true);
+    entry.PutUniqueServerTag(ModelTypeToRootTag(EXPERIMENTS));
+  }
+
+  EXPECT_FALSE(directory()->InitialSyncEndedForType(EXPERIMENTS));

[Nicolas Zea, 2015/10/09 22:23:34]

This test doesn't cover the case where there are no child items (like with the
nigori node), which I think might be broken.

[stanisc, 2015/10/10 00:44:18]

This case handles control types with implicit permanent folder. 
Nigori isn't broken. Handling of Nigori is unchanged - it still comes from the
server unapplied with base version = CHANGES_VERSION and the normal application
process still changes its base version. Basically for server created root nodes
there is no need to call the new MarkInitialSyncEndedForType method.
But you are right that there is no test case for Nigore. I'll see if I can add
one or modify one of the Nigori test cases above.

+
+  std::string experiment_id = "experiment";
+  sync_pb::EntitySpecifics specifics;
+  specifics.mutable_experiments()->mutable_keystore_encryption()->set_enabled(
+      true);
+  entry_factory_->CreateUnappliedNewItem(experiment_id, specifics, false);
+
+  ApplyControlDataUpdates(directory());
+
+  EXPECT_TRUE(directory()->InitialSyncEndedForType(EXPERIMENTS));
+}
+
 }  // namespace syncer