Unrevert "[Sync] Split GetPreferredTypes into GetActiveType...""

chrome/browser/sync/profile_sync_service_harness.cc

Index: chrome/browser/sync/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index 3d42e9158b6f255e4e8102ad7c812f8fef3cc7b9..facbcaadb6ff9095794bd55112e61878c2a48c2a 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -845,8 +845,8 @@ bool ProfileSyncServiceHarness::MatchesOtherClient(
   // Only look for a match if we have at least one enabled datatype in
   // common with the partner client.
   const syncer::ModelTypeSet common_types =
-      Intersection(service()->GetPreferredDataTypes(),
-                   partner->service()->GetPreferredDataTypes());
+      Intersection(service()->GetActiveDataTypes(),
+                   partner->service()->GetActiveDataTypes());
 
   DVLOG(2) << profile_debug_name_ << ", " << partner->profile_debug_name_
            << ": common types are "