[Sync] Add support for proxy types

chrome/browser/sync/test/integration/migration_errors_test.cc

Index: chrome/browser/sync/test/integration/migration_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
index 163a058cd8e1531cd89d4bc43c2fba3184681c25..331202f44361fcf2f54b8c392022ffc533d93186 100644
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -74,8 +74,9 @@ class MigrationTest : public SyncTest {
   enum TriggerMethod { MODIFY_PREF, MODIFY_BOOKMARK, TRIGGER_NOTIFICATION };
 
   syncer::ModelTypeSet GetPreferredDataTypes() {
-    const syncer::ModelTypeSet preferred_data_types =
+    syncer::ModelTypeSet preferred_data_types =
         GetClient(0)->service()->GetPreferredDataTypes();
+    preferred_data_types.RemoveAll(syncer::VirtualTypes());
     // Make sure all clients have the same preferred data types.
     for (int i = 1; i < num_clients(); ++i) {
       const syncer::ModelTypeSet other_preferred_data_types =