| Index: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
|
| index 2c81db52b304438cbb0eedfca483e2b2f9aabfb4..5fccf4fcd3874aa90ee3ddfffeb8dd64a5c718f5 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
|
| @@ -13,6 +13,7 @@ import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.test.util.CommandLineFlags;
|
| import org.chromium.chrome.browser.ChromeActivity;
|
| import org.chromium.chrome.browser.ChromeSwitches;
|
| +import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.MultipleOfflinePageItemCallback;
|
| import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageModelObserver;
|
| import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallback;
|
| import org.chromium.chrome.browser.profiles.Profile;
|
| @@ -227,15 +228,16 @@ public class OfflinePageUtilsTest extends ChromeActivityTestCaseBase<ChromeActiv
|
| private List<OfflinePageItem> getAllPages() throws InterruptedException {
|
| final Semaphore semaphore = new Semaphore(0);
|
| final List<OfflinePageItem> result = new ArrayList<OfflinePageItem>();
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + ThreadUtils.runOnUiThread(new Runnable() {
|
| @Override
|
| public void run() {
|
| - result.clear();
|
| - for (OfflinePageItem item : mOfflinePageBridge.getAllPages()) {
|
| - result.add(item);
|
| - }
|
| -
|
| - semaphore.release();
|
| + mOfflinePageBridge.getAllPages(new MultipleOfflinePageItemCallback() {
|
| + @Override
|
| + public void onResult(List<OfflinePageItem> allPages) {
|
| + result.addAll(allPages);
|
| + semaphore.release();
|
| + }
|
| + });
|
| }
|
| });
|
| assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
|
|
|