[Sync] Pass the correct set of enabled types to the sync notifier

chrome/browser/sync/test_profile_sync_service.cc

 // Copyright (c) 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 "chrome/browser/sync/test_profile_sync_service.h"
 
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
@@ skipping 68 matching lines @@
     MessageLoop::current()->Run();
   }
 }
 
 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer(
     syncer::ConfigureReason reason,
     syncer::ModelTypeSet types_to_config,
     const syncer::ModelSafeRoutingInfo& routing_info,
     const base::Callback<void(syncer::ModelTypeSet)>& ready_task,
     const base::Closure& retry_callback) {
-  syncer::ModelTypeSet sync_ended;
-  if (!fail_initial_download_)
-    sync_ended.PutAll(types_to_config);
+  syncer::ModelTypeSet failed_configuration_types;
+  if (fail_initial_download_) {

[Nicolas Zea, 2012/07/24 18:09:31]

nit: remove curly brace

[akalin, 2012/07/24 18:59:39]

Done.

+    failed_configuration_types = types_to_config;
+  }
 
-  FinishConfigureDataTypesOnFrontendLoop(types_to_config,
-                                         sync_ended,
+  FinishConfigureDataTypesOnFrontendLoop(failed_configuration_types,
                                          ready_task);
 }
 
 }  // namespace browser_sync
 
 syncer::TestIdFactory* TestProfileSyncService::id_factory() {
   return &id_factory_;
 }
 
 browser_sync::SyncBackendHostForProfileSyncTest*
@@ skipping 108 matching lines @@
 void TestProfileSyncService::CreateBackend() {
   backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest(
       profile(),
       sync_prefs_.AsWeakPtr(),
       invalidator_storage_.AsWeakPtr(),
       set_initial_sync_ended_on_init_,
       synchronous_backend_initialization_,
       fail_initial_download_,
       use_real_database_));
 }