[Sync] Move Android enabled types logic into native

sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.sync.notifier;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
@@ skipping 134 matching lines @@
         assertFalse(listenerCallbackCalled.get());
 
         // Ensure we get a callback, which means we have registered for them.
         ActivityStatus.onStateChange(new Activity(), ActivityStatus.RESUMED);
         assertTrue(listenerCallbackCalled.get());
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testRegisterForSpecificTypes() {
-        final String controllerFlag = "resolveModelTypes";
-        final ModelTypeResolver resolver = new ModelTypeResolver() {
-            @Override
-            public Set<ModelType> resolveModelTypes(Set<ModelType> modelTypes) {
-                mContext.setFlag(controllerFlag);
-                return modelTypes;
-            }
-        };
-        InvalidationController controller = new InvalidationController(mContext) {
-            @Override
-            ModelTypeResolver getModelTypeResolver() {
-                return resolver;
-            }
-        };
+        InvalidationController controller = new InvalidationController(mContext);
         Account account = new Account("test@example.com", "bogus");
         controller.setRegisteredTypes(account, false,
                 Sets.newHashSet(ModelType.BOOKMARK, ModelType.SESSION));
         assertEquals(1, mContext.getNumStartedIntents());
 
         // Validate destination.
         Intent intent = mContext.getStartedIntent(0);
         validateIntentComponent(intent);
         assertEquals(IntentProtocol.ACTION_REGISTER, intent.getAction());
 
         // Validate account.
         Account intentAccount = intent.getParcelableExtra(IntentProtocol.EXTRA_ACCOUNT);
         assertEquals(account, intentAccount);
 
         // Validate registered types.
         Set<String> expectedTypes =
                 Sets.newHashSet(ModelType.BOOKMARK.name(), ModelType.SESSION.name());
         Set<String> actualTypes = Sets.newHashSet();
         actualTypes.addAll(intent.getStringArrayListExtra(IntentProtocol.EXTRA_REGISTERED_TYPES));
         assertEquals(expectedTypes, actualTypes);
-        assertTrue(mContext.isFlagSet(controllerFlag));
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testRegisterForAllTypes() {
         Account account = new Account("test@example.com", "bogus");
         mController.setRegisteredTypes(account, true,
                 Sets.newHashSet(ModelType.BOOKMARK, ModelType.SESSION));
         assertEquals(1, mContext.getNumStartedIntents());
 
@@ skipping 16 matching lines @@
     @SmallTest
     @Feature({"Sync"})
     public void testRefreshShouldReadValuesFromDiskWithSpecificTypes() {
         // Store some preferences for ModelTypes and account. We are using the helper class
         // for this, so we don't have to deal with low-level details such as preference keys.
         InvalidationPreferences invalidationPreferences = new InvalidationPreferences(mContext);
         InvalidationPreferences.EditContext edit = invalidationPreferences.edit();
         Set<String> storedModelTypes = new HashSet<String>();
         storedModelTypes.add(ModelType.BOOKMARK.name());
         storedModelTypes.add(ModelType.TYPED_URL.name());
+        Set<ModelType> refreshedTypes = new HashSet<ModelType>();
+        refreshedTypes.add(ModelType.BOOKMARK);
+        refreshedTypes.add(ModelType.TYPED_URL);
         invalidationPreferences.setSyncTypes(edit, storedModelTypes);
         Account storedAccount = AccountManagerHelper.createAccountFromName("test@gmail.com");
         invalidationPreferences.setAccount(edit, storedAccount);
         invalidationPreferences.commit(edit);
 
         // Ensure all calls to {@link InvalidationController#setRegisteredTypes} store values
         // we can inspect in the test.
         final AtomicReference<Account> resultAccount = new AtomicReference<Account>();
         final AtomicBoolean resultAllTypes = new AtomicBoolean();
         final AtomicReference<Set<ModelType>> resultTypes = new AtomicReference<Set<ModelType>>();
         InvalidationController controller = new InvalidationController(mContext) {
             @Override
             public void setRegisteredTypes(
                     Account account, boolean allTypes, Set<ModelType> types) {
                 resultAccount.set(account);
                 resultAllTypes.set(allTypes);
                 resultTypes.set(types);
             }
         };
 
         // Execute the test.
-        controller.refreshRegisteredTypes();
+        controller.refreshRegisteredTypes(refreshedTypes);
 
         // Validate the values.
         assertEquals(storedAccount, resultAccount.get());
         assertEquals(false, resultAllTypes.get());
         assertEquals(ModelType.syncTypesToModelTypes(storedModelTypes), resultTypes.get());
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testRefreshShouldReadValuesFromDiskWithAllTypes() {
@@ skipping 18 matching lines @@
             @Override
             public void setRegisteredTypes(
                     Account account, boolean allTypes, Set<ModelType> types) {
                 resultAccount.set(account);
                 resultAllTypes.set(allTypes);
                 resultTypes.set(types);
             }
         };
 
         // Execute the test.
-        controller.refreshRegisteredTypes();
+        controller.refreshRegisteredTypes(new HashSet<ModelType>());
 
         // Validate the values.
         assertEquals(storedAccount, resultAccount.get());
         assertEquals(true, resultAllTypes.get());
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testGetContractAuthority() throws Exception {
         assertEquals(mContext.getPackageName(), mController.getContractAuthority());
@@ skipping 38 matching lines @@
         Intent getStartedIntent(int idx) {
             return startedIntents.get(idx);
         }
 
         @Override
         public PackageManager getPackageManager() {
             return getBaseContext().getPackageManager();
         }
     }
 }