[Sync] Calculate active types and track catch up in DTMI not PSS.

components/sync/driver/data_type_manager_impl.cc

Index: components/sync/driver/data_type_manager_impl.cc
diff --git a/components/sync/driver/data_type_manager_impl.cc b/components/sync/driver/data_type_manager_impl.cc
index 071d4c42bd447bf55ce6432c90d7285eec89fed0..78c0ff0fb175b6330ad3cd572f6fc477e0f9029a 100644
--- a/components/sync/driver/data_type_manager_impl.cc
+++ b/components/sync/driver/data_type_manager_impl.cc
@@ -792,13 +792,14 @@ void DataTypeManagerImpl::NotifyStart() {
 }
 
 void DataTypeManagerImpl::NotifyDone(const ConfigureResult& raw_result) {
-  catch_up_in_progress_ = false;
-
   DCHECK(!last_restart_time_.is_null());
   base::TimeDelta configure_time = base::Time::Now() - last_restart_time_;
 
   ConfigureResult result = raw_result;
   result.data_type_status_table = data_type_status_table_;
+  result.was_catch_up_configure = catch_up_in_progress_;
+
+  catch_up_in_progress_ = false;
 
   DVLOG(1) << "Total time spent configuring: " << configure_time.InSecondsF()
            << "s";
@@ -831,6 +832,12 @@ void DataTypeManagerImpl::NotifyDone(const ConfigureResult& raw_result) {
   observer_->OnConfigureDone(result);
 }
 
+ModelTypeSet DataTypeManagerImpl::GetActiveDataTypes() const {
+  if (state_ != CONFIGURED)
+    return ModelTypeSet();
+  return GetEnabledTypes();
+}
+
 DataTypeManager::State DataTypeManagerImpl::state() const {
   return state_;
 }