[Sync] Separate purge types step from sync manager configuration.

components/sync/engine_impl/sync_manager_impl_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/sync_manager_impl.h"
 
 #include <cstddef>
 #include <memory>
 #include <utility>
 
@@ skipping 2749 matching lines @@
   EXPECT_CALL(*scheduler(), ScheduleConfiguration(_))
       .WillOnce(SaveArg<0>(&params));
 
   // Set data for all types.
   ModelTypeSet protocol_types = ProtocolTypes();
   for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good();
        iter.Inc()) {
     SetProgressMarkerForType(iter.Get(), true);
   }
 
+  sync_manager_.PurgeDisabledTypes(disabled_types, ModelTypeSet(),
+                                   ModelTypeSet());
   CallbackCounter ready_task_counter, retry_task_counter;
   sync_manager_.ConfigureSyncer(
-      reason, types_to_download, disabled_types, ModelTypeSet(), ModelTypeSet(),
-      new_routing_info, base::Bind(&CallbackCounter::Callback,
-                                   base::Unretained(&ready_task_counter)),
+      reason, types_to_download, new_routing_info,
+      base::Bind(&CallbackCounter::Callback,
+                 base::Unretained(&ready_task_counter)),
       base::Bind(&CallbackCounter::Callback,
                  base::Unretained(&retry_task_counter)));
   EXPECT_EQ(0, ready_task_counter.times_called());
   EXPECT_EQ(0, retry_task_counter.times_called());
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::RECONFIGURATION, params.source);
   EXPECT_EQ(types_to_download, params.types_to_download);
   EXPECT_EQ(new_routing_info, params.routing_info);
 
   // Verify all the disabled types were purged.
   EXPECT_EQ(enabled_types,
@@ skipping 30 matching lines @@
       SetProgressMarkerForType(iter.Get(), true);
     } else {
       SetProgressMarkerForType(iter.Get(), false);
     }
   }
 
   // Set the context to have the old routing info.
   cycle_context()->SetRoutingInfo(old_routing_info);
 
   CallbackCounter ready_task_counter, retry_task_counter;
+  sync_manager_.PurgeDisabledTypes(ModelTypeSet(), ModelTypeSet(),
+                                   ModelTypeSet());
   sync_manager_.ConfigureSyncer(
-      reason, types_to_download, ModelTypeSet(), ModelTypeSet(), ModelTypeSet(),
-      new_routing_info, base::Bind(&CallbackCounter::Callback,
-                                   base::Unretained(&ready_task_counter)),
+      reason, types_to_download, new_routing_info,
+      base::Bind(&CallbackCounter::Callback,
+                 base::Unretained(&ready_task_counter)),
       base::Bind(&CallbackCounter::Callback,
                  base::Unretained(&retry_task_counter)));
   EXPECT_EQ(0, ready_task_counter.times_called());
   EXPECT_EQ(0, retry_task_counter.times_called());
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::RECONFIGURATION, params.source);
   EXPECT_EQ(types_to_download, params.types_to_download);
   EXPECT_EQ(new_routing_info, params.routing_info);
 
   // Verify only the recently disabled types were purged.
   EXPECT_EQ(disabled_types, sync_manager_.GetTypesWithEmptyProgressMarkerToken(
@@ skipping 62 matching lines @@
 
   // Add a fully synced preferences node under the root.
   std::string pref_client_tag = "prefABC";
   std::string pref_hashed_tag = "hashXYZ";
   sync_pb::EntitySpecifics pref_specifics;
   AddDefaultFieldValue(PREFERENCES, &pref_specifics);
   int pref_meta = MakeServerNode(share, PREFERENCES, pref_client_tag,
                                  pref_hashed_tag, pref_specifics);
 
   // And now, the purge.
-  EXPECT_TRUE(sync_manager_.PurgePartiallySyncedTypes());
+  sync_manager_.PurgePartiallySyncedTypes();
 
   // Ensure that autofill lost its progress marker, but preferences did not.
   ModelTypeSet empty_tokens =
       sync_manager_.GetTypesWithEmptyProgressMarkerToken(ModelTypeSet::All());
   EXPECT_TRUE(empty_tokens.Has(AUTOFILL));
   EXPECT_FALSE(empty_tokens.Has(PREFERENCES));
 
   // Ensure that autofill lost its node, but preferences did not.
   {
     syncable::ReadTransaction trans(FROM_HERE, share->directory.get());
@@ skipping 588 matching lines @@
 // SyncManagerInitInvalidStorageTest::GetFactory will return
 // DirectoryBackingStore that ensures that SyncManagerImpl::OpenDirectory fails.
 // SyncManagerImpl initialization is done in SyncManagerTest::SetUp. This test's
 // task is to ensure that SyncManagerImpl reported initialization failure in
 // OnInitializationComplete callback.
 TEST_F(SyncManagerInitInvalidStorageTest, FailToOpenDatabase) {
   EXPECT_FALSE(initialization_succeeded_);
 }
 
 }  // namespace syncer