[Sync] Add auto-generated ModelType in Java.

components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java

Index: components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
diff --git a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
index 3678ba5cf0690284e6b2e23273ae759950f5706a..8d8d1ce72eddace1316eed4ae828fdc9df1ecc34 100644
--- a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
+++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
@@ -22,8 +22,8 @@ import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.sync.AndroidSyncSettings;
+import org.chromium.sync.ModelTypeHelper;
 import org.chromium.sync.SyncConstants;
-import org.chromium.sync.internal_api.pub.base.ModelType;
 import org.chromium.sync.notifier.InvalidationClientNameProvider;
 import org.chromium.sync.notifier.InvalidationIntentProtocol;
 import org.chromium.sync.notifier.InvalidationPreferences;
@@ -295,7 +295,7 @@ public class InvalidationClientService extends AndroidListener {
     private Set<ObjectId> readSyncRegistrationsFromPrefs() {
         Set<String> savedTypes = new InvalidationPreferences(this).getSavedSyncedTypes();
         if (savedTypes == null) return Collections.emptySet();
-        else return ModelType.syncTypesToObjectIds(savedTypes);
+        else return ModelTypeHelper.modelTypeStringsToObjectIds(savedTypes);
     }
 
     /**
@@ -376,7 +376,8 @@ public class InvalidationClientService extends AndroidListener {
         // When computing the desired set of object ids, if only sync types were provided, then
         // keep the existing non-sync types, and vice-versa.
         Set<ObjectId> desiredSyncRegistrations = syncTypes != null
-                ? ModelType.syncTypesToObjectIds(syncTypes) : existingSyncRegistrations;
+                ? ModelTypeHelper.modelTypeStringsToObjectIds(syncTypes)
+                : existingSyncRegistrations;
         Set<ObjectId> desiredNonSyncRegistrations = objectIds != null
                 ? objectIds : existingNonSyncRegistrations;
         Set<ObjectId> desiredRegistrations = joinRegistrations(desiredNonSyncRegistrations,