[Sync] Use OnSingleDataTypeUnrecoverableError for all errors

chrome/browser/sync/profile_sync_components_factory_impl.cc

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 9778962f636b4ad2c7993e466921d1a7b789414f..5a74820d78659956cac82db1fd014810a3e5b324 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -179,24 +179,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
 #endif
 }
 
-void ProfileSyncComponentsFactoryImpl::DisableBrokenType(
-    syncer::ModelType type,
-    const tracked_objects::Location& from_here,
-    const std::string& message) {
-  ProfileSyncService* p = ProfileSyncServiceFactory::GetForProfile(profile_);
-  syncer::SyncError error(
-      from_here, syncer::SyncError::DATATYPE_ERROR, message, type);
-  p->DisableDatatype(error);
-}
-
-DataTypeController::DisableTypeCallback
-ProfileSyncComponentsFactoryImpl::MakeDisableCallbackFor(
-    syncer::ModelType type) {
-  return base::Bind(&ProfileSyncComponentsFactoryImpl::DisableBrokenType,
-                    weak_factory_.GetWeakPtr(),
-                    type);
-}
-
 void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
     syncer::ModelTypeSet disabled_types,
     syncer::ModelTypeSet enabled_types,
@@ -205,16 +187,14 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
   // disabled.
   if (!disabled_types.Has(syncer::AUTOFILL)) {
     pss->RegisterDataTypeController(
-        new AutofillDataTypeController(
-            this, profile_, MakeDisableCallbackFor(syncer::AUTOFILL)));
+        new AutofillDataTypeController(this, profile_));
   }
 
   // Autofill profile sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::AUTOFILL_PROFILE)) {
     pss->RegisterDataTypeController(
-        new AutofillProfileDataTypeController(
-            this, profile_, MakeDisableCallbackFor(syncer::AUTOFILL_PROFILE)));
+        new AutofillProfileDataTypeController(this, profile_));
   }
 
   // Bookmark sync is enabled by default.  Register unless explicitly
@@ -239,23 +219,20 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::HISTORY_DELETE_DIRECTIVES),
             syncer::HISTORY_DELETE_DIRECTIVES,
             this));
   }
 
   // Session sync is enabled by default.  Register unless explicitly disabled.
   if (!disabled_types.Has(syncer::PROXY_TABS)) {
-      pss->RegisterDataTypeController(new ProxyDataTypeController(
-         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
-         syncer::PROXY_TABS));
+    pss->RegisterDataTypeController(new ProxyDataTypeController(
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+        syncer::PROXY_TABS));
     pss->RegisterDataTypeController(
-        new SessionDataTypeController(
-            this,
-            profile_,
-            pss->GetSyncedWindowDelegatesGetter(),
-            pss->GetLocalDeviceInfoProvider(),
-            MakeDisableCallbackFor(syncer::SESSIONS)));
+        new SessionDataTypeController(this,
+                                      profile_,
+                                      pss->GetSyncedWindowDelegatesGetter(),
+                                      pss->GetLocalDeviceInfoProvider()));
   }
 
   // Favicon sync is enabled by default. Register unless explicitly disabled.
@@ -265,14 +242,12 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::FAVICON_IMAGES),
             syncer::FAVICON_IMAGES,
             this));
     pss->RegisterDataTypeController(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::FAVICON_TRACKING),
             syncer::FAVICON_TRACKING,
             this));
   }
@@ -281,8 +256,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
   // disabled.
   if (!disabled_types.Has(syncer::PASSWORDS)) {
     pss->RegisterDataTypeController(
-        new PasswordDataTypeController(
-            this, profile_, MakeDisableCallbackFor(syncer::PASSWORDS)));
+        new PasswordDataTypeController(this, profile_));
   }
 
   // Article sync is disabled by default.  Register only if explicitly enabled.
@@ -291,7 +265,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::ARTICLES),
             syncer::ARTICLES,
             this));
   }
@@ -299,19 +272,16 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
 #if defined(ENABLE_MANAGED_USERS)
   pss->RegisterDataTypeController(
       new SupervisedUserSyncDataTypeController(
-          MakeDisableCallbackFor(syncer::SUPERVISED_USER_SETTINGS),
           syncer::SUPERVISED_USER_SETTINGS,
           this,
           profile_));
   pss->RegisterDataTypeController(
       new SupervisedUserSyncDataTypeController(
-          MakeDisableCallbackFor(syncer::SUPERVISED_USERS),
           syncer::SUPERVISED_USERS,
           this,
           profile_));
   pss->RegisterDataTypeController(
       new SupervisedUserSyncDataTypeController(
-          MakeDisableCallbackFor(syncer::SUPERVISED_USER_SHARED_SETTINGS),
           syncer::SUPERVISED_USER_SHARED_SETTINGS,
           this,
           profile_));
@@ -326,17 +296,14 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
   // disabled.
   if (!disabled_types.Has(syncer::APPS)) {
     pss->RegisterDataTypeController(
-        new ExtensionDataTypeController(syncer::APPS, this, profile_,
-                                        MakeDisableCallbackFor(syncer::APPS)));
+        new ExtensionDataTypeController(syncer::APPS, this, profile_));
   }
 
   // Extension sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::EXTENSIONS)) {
     pss->RegisterDataTypeController(
-        new ExtensionDataTypeController(
-            syncer::EXTENSIONS, this, profile_,
-            MakeDisableCallbackFor(syncer::EXTENSIONS)));
+        new ExtensionDataTypeController(syncer::EXTENSIONS, this, profile_));
   }
 
   // Preference sync is enabled by default.  Register unless explicitly
@@ -346,7 +313,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::PREFERENCES),
             syncer::PREFERENCES,
             this));
   }
@@ -356,7 +322,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::PRIORITY_PREFERENCES),
             syncer::PRIORITY_PREFERENCES,
             this));
   }
@@ -365,8 +330,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
   // Theme sync is enabled by default.  Register unless explicitly disabled.
   if (!disabled_types.Has(syncer::THEMES)) {
     pss->RegisterDataTypeController(
-        new ThemeDataTypeController(this, profile_,
-                                    MakeDisableCallbackFor(syncer::THEMES)));
+        new ThemeDataTypeController(this, profile_));
   }
 #endif
 
@@ -374,26 +338,21 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
   // disabled.
   if (!disabled_types.Has(syncer::SEARCH_ENGINES)) {
     pss->RegisterDataTypeController(
-        new SearchEngineDataTypeController(
-            this, profile_, MakeDisableCallbackFor(syncer::SEARCH_ENGINES)));
+        new SearchEngineDataTypeController(this, profile_));
   }
 
   // Extension setting sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::EXTENSION_SETTINGS)) {
-    pss->RegisterDataTypeController(
-        new ExtensionSettingDataTypeController(
-            syncer::EXTENSION_SETTINGS, this, profile_,
-            MakeDisableCallbackFor(syncer::EXTENSION_SETTINGS)));
+    pss->RegisterDataTypeController(new ExtensionSettingDataTypeController(
+        syncer::EXTENSION_SETTINGS, this, profile_));
   }
 
   // App setting sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::APP_SETTINGS)) {
-    pss->RegisterDataTypeController(
-        new ExtensionSettingDataTypeController(
-            syncer::APP_SETTINGS, this, profile_,
-            MakeDisableCallbackFor(syncer::APP_SETTINGS)));
+    pss->RegisterDataTypeController(new ExtensionSettingDataTypeController(
+        syncer::APP_SETTINGS, this, profile_));
   }
 
 #if defined(ENABLE_APP_LIST)
@@ -402,7 +361,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::APP_LIST),
             syncer::APP_LIST,
             this));
   }
@@ -413,7 +371,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
   if (enabled_types.Has(syncer::SYNCED_NOTIFICATIONS)) {
     pss->RegisterDataTypeController(
         new ExtensionBackedDataTypeController(
-              MakeDisableCallbackFor(syncer::SYNCED_NOTIFICATIONS),
               syncer::SYNCED_NOTIFICATIONS,
               "",  // TODO(dewittj): pass the extension hash here.
               this,
@@ -421,7 +378,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
 
     pss->RegisterDataTypeController(
         new ExtensionBackedDataTypeController(
-              MakeDisableCallbackFor(syncer::SYNCED_NOTIFICATION_APP_INFO),
               syncer::SYNCED_NOTIFICATION_APP_INFO,
               "",  // TODO(dewittj): pass the extension hash here.
               this,
@@ -436,7 +392,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            MakeDisableCallbackFor(syncer::DICTIONARY),
             syncer::DICTIONARY,
             this));
   }