[Sync] Adjust types to configure during shutdown

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 233 matching lines @@
     ResetCycle();
 
     // Pretend we've seen a local change, to make the nudge_tracker look normal.
     nudge_tracker_.RecordLocalChange(ModelTypeSet(BOOKMARKS));
 
     return syncer_->NormalSyncShare(context_->GetEnabledTypes(),
                                     &nudge_tracker_, cycle_.get());
   }
 
   bool SyncShareConfigure() {
+    return SyncShareConfigureTypes(context_->GetEnabledTypes());
+  }
+
+  bool SyncShareConfigureTypes(ModelTypeSet types) {
     ResetCycle();
     return syncer_->ConfigureSyncShare(
-        context_->GetEnabledTypes(),
-        sync_pb::GetUpdatesCallerInfo::RECONFIGURATION, cycle_.get());
+        types, sync_pb::GetUpdatesCallerInfo::RECONFIGURATION, cycle_.get());
   }
 
   void SetUp() override {
     test_user_share_.SetUp();
     mock_server_ = base::MakeUnique<MockConnectionManager>(
         directory(), &cancelation_signal_);
     debug_info_getter_ = base::MakeUnique<MockDebugInfoGetter>();
     workers_.push_back(
         scoped_refptr<ModelSafeWorker>(new FakeModelWorker(GROUP_PASSIVE)));
     std::vector<SyncEngineEventListener*> listeners;
@@ skipping 4744 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();
+
+  // 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());
     EXPECT_TRUE(directory()->GetNigoriHandler()->NeedKeystoreKey(&rtrans));
   }
 
   SyncShareConfigure();
 
   EXPECT_EQ(SYNCER_OK, cycle_->status_controller().last_get_key_result());
   {
@@ skipping 861 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