Add PSS.getActiveDataTypes().

chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
index 75d03dbac9c93164d00013358beec443448388a7..24017411efb3f075548785dff640aab0e0893ff3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
@@ -328,13 +328,28 @@ public class ProfileSyncService {
     }
 
     /**
-     * Gets the set of data types that are currently enabled to sync.
+     * Gets the set of data types that are currently syncing.
      *
-     * @return Set of enabled types.
+     * This is affected by whether sync is on.
+     *
+     * @return Set of active data types.
+     */
+    public Set<ModelType> getActiveDataTypes() {
+        long modelTypeSelection = nativeGetActiveDataTypes(mNativeProfileSyncServiceAndroid);
+        return modelTypeSelectionToSet(modelTypeSelection);
+    }
+
+    /**
+     * Gets the set of data types that are enabled in sync.
+     *
+     * This is unaffected by whether sync is on.
+     *
+     * @return Set of preferred types.
      */
     public Set<ModelType> getPreferredDataTypes() {
-        long modelTypeSelection =
-                nativeGetEnabledDataTypes(mNativeProfileSyncServiceAndroid);
+        // TODO(maxbogue): Correct this line to GetPreferredDataTypes once
+        // downstream uses are fixed.
+        long modelTypeSelection = nativeGetActiveDataTypes(mNativeProfileSyncServiceAndroid);
         return modelTypeSelectionToSet(modelTypeSelection);
     }
 
@@ -588,7 +603,8 @@ public class ProfileSyncService {
     private native String nativeGetSyncEnterCustomPassphraseBodyText(
             long nativeProfileSyncServiceAndroid);
     private native boolean nativeIsSyncKeystoreMigrationDone(long nativeProfileSyncServiceAndroid);
-    private native long nativeGetEnabledDataTypes(long nativeProfileSyncServiceAndroid);
+    private native long nativeGetActiveDataTypes(long nativeProfileSyncServiceAndroid);
+    private native long nativeGetPreferredDataTypes(long nativeProfileSyncServiceAndroid);
     private native void nativeSetPreferredDataTypes(
             long nativeProfileSyncServiceAndroid, boolean syncEverything, long modelTypeSelection);
     private native void nativeSetSetupInProgress(