| Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
|
| diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
|
| index 26d9ea6303184f51646efd9d68fe209de819ac10..c50ee4af2232b5bc7182ea250271c9feff113db1 100644
|
| --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
|
| +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
|
| @@ -32,9 +32,9 @@ import java.util.Iterator;
|
| import java.util.List;
|
| import java.util.Locale;
|
| import java.util.Map;
|
| +import java.util.concurrent.Callable;
|
| import java.util.concurrent.Semaphore;
|
| import java.util.concurrent.TimeUnit;
|
| -import java.util.concurrent.atomic.AtomicBoolean;
|
| import java.util.concurrent.atomic.AtomicLong;
|
|
|
| /**
|
| @@ -279,14 +279,12 @@ public final class SyncTestUtil {
|
| * Returns whether the sync engine has keep everything synced set to true.
|
| */
|
| public static boolean isSyncEverythingEnabled(final Context context) {
|
| - final AtomicBoolean result = new AtomicBoolean();
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + return ThreadUtils.runOnUiThreadBlockingNoException(new Callable<Boolean>() {
|
| @Override
|
| - public void run() {
|
| - result.set(ProfileSyncService.get().hasKeepEverythingSynced());
|
| + public Boolean call() {
|
| + return ProfileSyncService.get().hasKeepEverythingSynced();
|
| }
|
| });
|
| - return result.get();
|
| }
|
|
|
| /**
|
|
|