[Sync] Make SMTP always have the dump stack function.

components/browser_sync/profile_sync_components_factory_impl.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 "components/browser_sync/profile_sync_components_factory_impl.h"
 
 #include <utility>
 
-#include "base/debug/dump_without_crashing.h"
 #include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autofill_wallet_data_type_controller.h"
 #include "components/autofill/core/browser/webdata/autofill_data_type_controller.h"
 #include "components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
@@ skipping 115 matching lines @@
     syncer::ModelTypeSet disabled_types,
     syncer::ModelTypeSet enabled_types) {
   base::Closure error_callback =
       base::Bind(&syncer::ReportUnrecoverableError, channel_);
 
   // TODO(stanisc): can DEVICE_INFO be one of disabled datatypes?
   if (base::FeatureList::IsEnabled(switches::kSyncUSSDeviceInfo)) {
     // Use an error callback that always uploads a stacktrace if it can to help
     // get USS as stable as possible.
     sync_service->RegisterDataTypeController(
-        base::MakeUnique<ModelTypeController>(
-            syncer::DEVICE_INFO,
-            base::Bind(base::IgnoreResult(&base::debug::DumpWithoutCrashing)),
-            sync_client_, ui_thread_));
+        base::MakeUnique<ModelTypeController>(syncer::DEVICE_INFO, sync_client_,
+                                              ui_thread_));
   } else {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<DeviceInfoDataTypeController>(
             error_callback, sync_client_,
             sync_service->GetLocalDeviceInfoProvider()));
   }
 
   // Autocomplete sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::AUTOFILL)) {
     if (base::FeatureList::IsEnabled(switches::kSyncUSSAutocomplete)) {
       sync_service->RegisterDataTypeController(
-          base::MakeUnique<ModelTypeController>(
-              syncer::AUTOFILL,
-              base::Bind(base::IgnoreResult(&base::debug::DumpWithoutCrashing)),
-              sync_client_, db_thread_));
+          base::MakeUnique<ModelTypeController>(syncer::AUTOFILL, sync_client_,
+                                                db_thread_));
     } else {
       sync_service->RegisterDataTypeController(
           base::MakeUnique<AutofillDataTypeController>(
               db_thread_, error_callback, sync_client_, web_data_service_));
     }
   }
 
   // Autofill sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::AUTOFILL_PROFILE)) {
@@ skipping 86 matching lines @@
   }
 
   if (!disabled_types.Has(syncer::PREFERENCES)) {
     if (!override_prefs_controller_to_uss_for_test_) {
       sync_service->RegisterDataTypeController(
           base::MakeUnique<AsyncDirectoryTypeController>(
               syncer::PREFERENCES, error_callback, sync_client_,
               syncer::GROUP_UI, ui_thread_));
     } else {
       sync_service->RegisterDataTypeController(
-          base::MakeUnique<ModelTypeController>(
-              syncer::PREFERENCES, error_callback, sync_client_, ui_thread_));
+          base::MakeUnique<ModelTypeController>(syncer::PREFERENCES,
+                                                sync_client_, ui_thread_));
     }
   }
 
   if (!disabled_types.Has(syncer::PRIORITY_PREFERENCES)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<AsyncDirectoryTypeController>(
             syncer::PRIORITY_PREFERENCES, error_callback, sync_client_,
             syncer::GROUP_UI, ui_thread_));
   }
 
   // Article sync is disabled by default.  Register only if explicitly enabled.
   if (dom_distiller::IsEnableSyncArticlesSet()) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<AsyncDirectoryTypeController>(
             syncer::ARTICLES, error_callback, sync_client_, syncer::GROUP_UI,
             ui_thread_));
   }
 
   // Reading list sync is enabled by default only on iOS. Register unless
   // Reading List or Reading List Sync is explicitly disabled.
   if (!disabled_types.Has(syncer::READING_LIST) &&
       reading_list::switches::IsReadingListEnabled()) {
     sync_service->RegisterDataTypeController(
-        base::MakeUnique<ModelTypeController>(
-            syncer::READING_LIST, error_callback, sync_client_, ui_thread_));
+        base::MakeUnique<ModelTypeController>(syncer::READING_LIST,
+                                              sync_client_, ui_thread_));
   }
 }
 
 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
     syncer::ModelTypeSet initial_types,
     const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
         debug_info_listener,
     const DataTypeController::TypeMap* controllers,
     const syncer::DataTypeEncryptionHandler* encryption_handler,
     syncer::ModelTypeConfigurer* configurer,
@@ skipping 125 matching lines @@
 
 // static
 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) {
   override_prefs_controller_to_uss_for_test_ = use_uss;
 }
 
 bool ProfileSyncComponentsFactoryImpl::
     override_prefs_controller_to_uss_for_test_ = false;
 
 }  // namespace browser_sync