[Sync] Add auto-generated ModelType in Java.

chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java
index abbf8fa36442dfd866ce860e26d9946a845c98eb..05c2f33b6b97062405126a4d2a5fa1bf42064042 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java
@@ -16,12 +16,15 @@ import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CollectionUtil;
+import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.test.invalidation.IntentSavingContext;
 import org.chromium.components.invalidation.InvalidationClientService;
 import org.chromium.sync.AndroidSyncSettings;
-import org.chromium.sync.internal_api.pub.base.ModelType;
+import org.chromium.sync.ModelType;
+import org.chromium.sync.ModelTypeHelper;
 import org.chromium.sync.notifier.InvalidationIntentProtocol;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.ChromeSigninController;
@@ -40,13 +43,13 @@ public class InvalidationControllerTest extends InstrumentationTestCase {
      * {@link ProfileSyncService#getPreferredDataTypes()}
      */
     private static class ProfileSyncServiceStub extends ProfileSyncService {
-        private Set<ModelType> mPreferredDataTypes;
+        private Set<Integer> mPreferredDataTypes;
 
         public ProfileSyncServiceStub(Context context) {
             super(context);
         }
 
-        public void setPreferredDataTypes(Set<ModelType> types) {
+        public void setPreferredDataTypes(Set<Integer> types) {
             mPreferredDataTypes = types;
         }
 
@@ -56,7 +59,7 @@ public class InvalidationControllerTest extends InstrumentationTestCase {
         }
 
         @Override
-        public Set<ModelType> getPreferredDataTypes() {
+        public Set<Integer> getPreferredDataTypes() {
             return mPreferredDataTypes;
         }
     }
@@ -68,6 +71,7 @@ public class InvalidationControllerTest extends InstrumentationTestCase {
     @Override
     protected void setUp() throws Exception {
         mContext = new IntentSavingContext(getInstrumentation().getTargetContext());
+        LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized(mContext);

[Nicolas Zea, 2015/07/30 01:02:04]

What is this for?

[maxbogue, 2015/07/30 21:15:15]

It loads native, which is now necessary for sync invalidation code so it can do
the ModelType -> string conversion.

         mController = InvalidationController.get(mContext);
         // We don't want to use the system content resolver, so we override it.
         MockSyncContentResolverDelegate delegate = new MockSyncContentResolverDelegate();
@@ -173,7 +177,7 @@ public class InvalidationControllerTest extends InstrumentationTestCase {
         Account account = AccountManagerHelper.createAccountFromName("test@example.com");
         ChromeSigninController.get(mContext).setSignedInAccountName(account.name);
         mProfileSyncServiceStub.setPreferredDataTypes(
-                CollectionUtil.newHashSet(ModelType.BOOKMARK, ModelType.SESSION));
+                CollectionUtil.newHashSet(ModelType.BOOKMARKS, ModelType.SESSIONS));
 
         InvalidationController controller = new InvalidationController(mContext);
         controller.ensureStartedAndUpdateRegisteredTypes();
@@ -190,8 +194,9 @@ public class InvalidationControllerTest extends InstrumentationTestCase {
         assertEquals(account, intentAccount);
 
         // Validate registered types.
-        Set<String> expectedTypes = CollectionUtil.newHashSet(ModelType.BOOKMARK.name(),
-                ModelType.SESSION.name());
+        Set<String> expectedTypes = CollectionUtil.newHashSet(
+                ModelTypeHelper.toString(ModelType.BOOKMARKS),
+                ModelTypeHelper.toString(ModelType.SESSIONS));
         Set<String> actualTypes = new HashSet<String>();
         actualTypes.addAll(intent.getStringArrayListExtra(
                                 InvalidationIntentProtocol.EXTRA_REGISTERED_TYPES));