[Sync] Restrict types to configure to only include registered types

components/sync/engine_impl/syncer_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 "components/sync/engine_impl/syncer.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 5004 matching lines @@
   EXPECT_TRUE(n1.GetIsUnappliedUpdate());
 
   // The second node was not downloaded.
   Entry n2(&trans, GET_BY_ID, node2);
   EXPECT_FALSE(n2.good());
 
   // One update remains undownloaded.
   mock_server_->ClearUpdatesQueue();
 }
 
-// Tests that, after shutdown initiated, if set of types to download includes
-// unregistered type, DCHECK doesn't get triggered.
-TEST_F(SyncerTest, ConfigureUnregisteredTypesDuringShutdown) {
-  // Signal that shutdown is initiated.
-  cancelation_signal_.Signal();
-
+// Tests that if type is not registered with ModelTypeRegistry (e.g. because
+// type's LoadModels failed), Syncer::ConfigureSyncShare runs without triggering
+// DCHECK.
+TEST_F(SyncerTest, ConfigureFailedUnregisteredType) {
   // Simulate type being unregistered before configuration by including type
   // that isn't registered with ModelTypeRegistry.
   SyncShareConfigureTypes(ModelTypeSet(APPS));
 
   // No explicit verification, DCHECK shouldn't have been triggered.
 }
 
 TEST_F(SyncerTest, GetKeySuccess) {
   {
     syncable::ReadTransaction rtrans(FROM_HERE, directory());
@@ skipping 868 matching lines @@
     EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id);
     EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count);
     EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count);
   } else {
     EXPECT_TRUE(final_monitor_records.empty())
         << "Should not restore records after successful bookmark commit.";
   }
 }
 
 }  // namespace syncer