[Sync] Move Android enabled types logic into native

[Sync] Move Android enabled types logic into native

This adds a JNI method to get the set of enabled types, which is then used
in registering for invalidations.

BUG=224144
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191025

[Nicolas Zea, 2013-03-27 01:27:37]

PTAL

[nyquist, 2013-03-27 01:43:20]

https://codereview.chromium.org/13109002/diff/2001/chrome/android/java/src/or...
File
chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
(right):

https://codereview.chromium.org/13109002/diff/2001/chrome/android/java/src/or...
chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java:370:
if ((modelTypeSelection & ModelTypeSelection.AUTOFILL) != 0) {
Could you remove the old methods? They were only in use here.
IsAutofillSyncEnabled
IsBookmarkSyncEnabled
IsPasswordSyncEnabled
IsTypedUrlSyncEnabled
IsSessionSyncEnabled

You would need to remove the JNI method declaration (at the end of this file)
and from profile_sync_service_android.[cc|h]

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
File
sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
(right):

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java:62:
DEVICE_INFO("DEVICE_INFO"),
Add true param

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
File
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java
(right):

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java:124:
typesToRegister.remove(ModelType.PROXY_TABS);
Could you file a bug to ensure we remove all dependency on ModelType from
invalidations?

https://codereview.chromium.org/13109002/diff/2001/sync/android/javatests/src...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
(right):

https://codereview.chromium.org/13109002/diff/2001/sync/android/javatests/src...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java:155:
final String controllerFlag = "resolveModelTypes";
Since this is not set anymore, I believe you have to remove this.

[nyquist, 2013-03-27 02:03:33]

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
File
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java
(right):

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java:138:
public void refreshRegisteredTypes(Set<ModelType> types) {
This method is called from downstream.
Please add ensure the old API is kept, and add @Deprecated to it.

I assume you could just have it as something like:

@Deprecated
public void refreshRegisteredTypes() {
    InvalidationPreferences invalidationPreferences = new
InvalidationPreferences(mContext);
    Set<ModelType> modelTypes = savedSyncedTypes == null ?
        new HashSet<ModelType>() :
ModelType.syncTypesToModelTypes(savedSyncedTypes);
    refreshRegisteredTypes(modelTypes);
}

[Nicolas Zea, 2013-03-27 02:09:02]

PTAL

https://codereview.chromium.org/13109002/diff/2001/chrome/android/java/src/or...
File
chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
(right):

https://codereview.chromium.org/13109002/diff/2001/chrome/android/java/src/or...
chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java:370:
if ((modelTypeSelection & ModelTypeSelection.AUTOFILL) != 0) {
On 2013/03/27 01:43:20, nyquist wrote:
> Could you remove the old methods? They were only in use here.
> IsAutofillSyncEnabled
> IsBookmarkSyncEnabled
> IsPasswordSyncEnabled
> IsTypedUrlSyncEnabled
> IsSessionSyncEnabled
> 
> You would need to remove the JNI method declaration (at the end of this file)
> and from profile_sync_service_android.[cc|h]

Done.

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
File
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java
(right):

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java:124:
typesToRegister.remove(ModelType.PROXY_TABS);
On 2013/03/27 01:43:20, nyquist wrote:
> Could you file a bug to ensure we remove all dependency on ModelType from
> invalidations?

Done, filed 224161.

https://codereview.chromium.org/13109002/diff/2001/sync/android/java/src/org/...
sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java:138:
public void refreshRegisteredTypes(Set<ModelType> types) {
On 2013/03/27 02:03:34, nyquist wrote:
> This method is called from downstream.
> Please add ensure the old API is kept, and add @Deprecated to it.
> 
> I assume you could just have it as something like:
> 
> @Deprecated
> public void refreshRegisteredTypes() {
>     InvalidationPreferences invalidationPreferences = new
> InvalidationPreferences(mContext);
>     Set<ModelType> modelTypes = savedSyncedTypes == null ?
>         new HashSet<ModelType>() :
> ModelType.syncTypesToModelTypes(savedSyncedTypes);
>     refreshRegisteredTypes(modelTypes);
> }

Done.

https://codereview.chromium.org/13109002/diff/2001/sync/android/javatests/src...
File
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
(right):

https://codereview.chromium.org/13109002/diff/2001/sync/android/javatests/src...
sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java:155:
final String controllerFlag = "resolveModelTypes";
On 2013/03/27 01:43:20, nyquist wrote:
> Since this is not set anymore, I believe you have to remove this.

Done.

[nyquist, 2013-03-27 02:14:32]

lgtm with comment

https://codereview.chromium.org/13109002/diff/13001/sync/android/java/src/org...
File
sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
(right):

https://codereview.chromium.org/13109002/diff/13001/sync/android/java/src/org...
sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java:158:
public static Set<ModelType> controlTypes() {
This method is not called anymore.
Which technically means that we could then remove the mControl field and the
constructor param. My bad.

[Nicolas Zea, 2013-03-27 17:15:49]

Done. 

+Nilesh for ProfileSyncService.Java owners

https://codereview.chromium.org/13109002/diff/13001/sync/android/java/src/org...
File
sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
(right):

https://codereview.chromium.org/13109002/diff/13001/sync/android/java/src/org...
sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java:158:
public static Set<ModelType> controlTypes() {
On 2013/03/27 02:14:33, nyquist wrote:
> This method is not called anymore.
> Which technically means that we could then remove the mControl field and the
> constructor param. My bad.

Done.

[nilesh, 2013-03-27 17:32:59]

On 2013/03/27 17:15:49, Nicolas Zea wrote:
> Done. 
> 
> +Nilesh for ProfileSyncService.Java owners
lgtm

[commit-bot: I haz the power, 2013-03-27 18:06:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/13109002/25001

[commit-bot: I haz the power, 2013-03-27 21:18:20]

Change committed as 191025