Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

Issue 2564163002: [Offline Pages] Remove load state from public OfflinePageModel API. (Closed)
Patch Set: Fix broken tests. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
index f956610d7c9a711192fd64aaac9e9bd57cbb572f..8918ddfd551ce77fd3b99fd7c3db2fc432b4ad56 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
@@ -12,7 +12,6 @@ import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.RetryOnFailure;
import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageModelObserver;
import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallback;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.test.ChromeActivityTestCaseBase;
@@ -49,8 +48,7 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
private void initializeBridgeForProfile(final boolean incognitoProfile)
throws InterruptedException {
- final Semaphore semaphore = new Semaphore(0);
- ThreadUtils.runOnUiThread(new Runnable() {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
Profile profile = Profile.getLastUsedProfile();
@@ -59,20 +57,8 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
}
// Ensure we start in an offline state.
mOfflinePageBridge = OfflinePageBridge.getForProfile(profile);
- if (mOfflinePageBridge == null || mOfflinePageBridge.isOfflinePageModelLoaded()) {
- semaphore.release();
- return;
- }
- mOfflinePageBridge.addObserver(new OfflinePageModelObserver() {
- @Override
- public void offlinePageModelLoaded() {
- semaphore.release();
- mOfflinePageBridge.removeObserver(this);
- }
- });
}
});
- assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
}
@Override

Powered by Google App Engine
This is Rietveld 408576698