[Sync] Move reenable logic into DTM

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 985126b6070024634e25897952c8ce41ece361d1..ef8d9b3658c98d5b016804ae56eb3e2bd18a952d 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -949,21 +949,8 @@ void ProfileSyncService::OnUnrecoverableErrorImpl(
 }
 
 void ProfileSyncService::ReenableDatatype(syncer::ModelType type) {
-  // Only reconfigure if the type actually had a data type or unready error.
-  if (!failed_data_types_handler_.ResetDataTypeErrorFor(type) &&
-      !failed_data_types_handler_.ResetUnreadyErrorFor(type)) {
-    return;
-  }
-
-  // If the type is no longer enabled, don't bother reconfiguring.
-  // TODO(zea): something else should encapsulate the notion of "whether a type
-  // should be enabled".
-  if (!syncer::CoreTypes().Has(type) && !GetPreferredDataTypes().Has(type))
-    return;
-
-  base::MessageLoop::current()->PostTask(FROM_HERE,
-      base::Bind(&ProfileSyncService::ReconfigureDatatypeManager,
-                 weak_factory_.GetWeakPtr()));
+  DCHECK(backend_initialized_);
+  directory_data_type_manager_->ReenableType(type);

[maniscalco, 2014/08/04 23:59:30]

I noticed that elsewhere in this class we check that ddtm is not null.  Do we
need to have a similar check here?

[Nicolas Zea, 2014/08/06 21:20:08]

At the moment I've taking the opinion that it's invalid to call this if the
backend is not initialized (else why are you reenabling the type?). The DCHECK
above will fire in that case, after which the dtm is guaranteed to not be null.

 }
 
 void ProfileSyncService::UpdateBackendInitUMA(bool success) {