| Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
|
| diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
|
| index f967b31ca2fff76d14215f160804ad013aad630e..710a28343ddcfd7c0e0d9f86b34657e2a9366c08 100644
|
| --- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
|
| +++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
|
| @@ -16,7 +16,6 @@ import org.chromium.chrome.browser.signin.SigninManager;
|
| import org.chromium.chrome.shell.ChromeShellTestBase;
|
| import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
|
| import org.chromium.sync.AndroidSyncSettings;
|
| -import org.chromium.sync.internal_api.pub.base.ModelType;
|
| import org.chromium.sync.signin.AccountManagerHelper;
|
| import org.chromium.sync.signin.ChromeSigninController;
|
| import org.chromium.sync.test.util.MockAccountManager;
|
| @@ -187,11 +186,11 @@ public class SyncTestBase extends ChromeShellTestBase {
|
| });
|
| }
|
|
|
| - protected void disableDataType(final ModelType modelType) {
|
| + protected void disableDataType(final int modelType) {
|
| ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| @Override
|
| public void run() {
|
| - Set<ModelType> preferredTypes = mProfileSyncService.getPreferredDataTypes();
|
| + Set<Integer> preferredTypes = mProfileSyncService.getPreferredDataTypes();
|
| preferredTypes.remove(modelType);
|
| mProfileSyncService.setPreferredDataTypes(false, preferredTypes);
|
| }
|
|
|