[Sync] Add auto-generated ModelType in Java.

chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
index 861eda322ad32245c7d5d22cd34fe912f6af52d5..78e0e3e11676aa301ccc3e68c0337dfd8cbeec56 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
@@ -33,8 +33,8 @@ import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.SyncController;
 import org.chromium.sync.AndroidSyncSettings;
+import org.chromium.sync.ModelType;
 import org.chromium.sync.internal_api.pub.PassphraseType;
-import org.chromium.sync.internal_api.pub.base.ModelType;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -315,14 +315,14 @@ public class SyncCustomizationFragment extends PreferenceFragment
         invController.ensureStartedAndUpdateRegisteredTypes();
     }
 
-    private Set<ModelType> getSelectedModelTypes() {
-        Set<ModelType> types = new HashSet<ModelType>();
+    private Set<Integer> getSelectedModelTypes() {
+        Set<Integer> types = new HashSet<Integer>();
         if (mSyncAutofill.isChecked()) types.add(ModelType.AUTOFILL);
-        if (mSyncBookmarks.isChecked()) types.add(ModelType.BOOKMARK);
-        if (mSyncOmnibox.isChecked()) types.add(ModelType.TYPED_URL);
-        if (mSyncPasswords.isChecked()) types.add(ModelType.PASSWORD);
+        if (mSyncBookmarks.isChecked()) types.add(ModelType.BOOKMARKS);
+        if (mSyncOmnibox.isChecked()) types.add(ModelType.TYPED_URLS);
+        if (mSyncPasswords.isChecked()) types.add(ModelType.PASSWORDS);
         if (mSyncRecentTabs.isChecked()) types.add(ModelType.PROXY_TABS);
-        if (mSyncSettings.isChecked()) types.add(ModelType.PREFERENCE);
+        if (mSyncSettings.isChecked()) types.add(ModelType.PREFERENCES);
         return types;
     }
 
@@ -510,16 +510,16 @@ public class SyncCustomizationFragment extends PreferenceFragment
             pref.setEnabled(isSyncEnabled && !syncEverything && canSyncType);
         }
         if (isSyncEnabled && !syncEverything) {
-            Set<ModelType> syncTypes = mProfileSyncService.getPreferredDataTypes();
+            Set<Integer> syncTypes = mProfileSyncService.getPreferredDataTypes();
             mSyncAutofill.setChecked(syncTypes.contains(ModelType.AUTOFILL));
-            mSyncBookmarks.setChecked(syncTypes.contains(ModelType.BOOKMARK));
-            mSyncOmnibox.setChecked(syncTypes.contains(ModelType.TYPED_URL));
+            mSyncBookmarks.setChecked(syncTypes.contains(ModelType.BOOKMARKS));
+            mSyncOmnibox.setChecked(syncTypes.contains(ModelType.TYPED_URLS));
             mSyncPasswords.setChecked(passwordSyncConfigurable
-                    && syncTypes.contains(ModelType.PASSWORD));
+                    && syncTypes.contains(ModelType.PASSWORDS));
             mSyncRecentTabs.setChecked(syncTypes.contains(ModelType.PROXY_TABS));
             // TODO(zea): Switch this to PREFERENCE once that datatype is
             // supported on Android.
-            mSyncSettings.setChecked(syncTypes.contains(ModelType.PRIORITY_PREFERENCE));
+            mSyncSettings.setChecked(syncTypes.contains(ModelType.PRIORITY_PREFERENCES));
         }
     }