| 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 3200cb5c6013556efa41f20cc4ff649034e4d7a1..99f076fc685dd3707da3ccd22945aac7bb0115b5 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
|
| @@ -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.browser.snackbar.SnackbarManager.SnackbarController;
|
| @@ -49,7 +48,6 @@ public class OfflinePageUtilsTest extends ChromeActivityTestCaseBase<ChromeActiv
|
| @Override
|
| protected void setUp() throws Exception {
|
| super.setUp();
|
| - final Semaphore semaphore = new Semaphore(0);
|
| ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| @Override
|
| public void run() {
|
| @@ -63,20 +61,8 @@ public class OfflinePageUtilsTest extends ChromeActivityTestCaseBase<ChromeActiv
|
| if (!NetworkChangeNotifier.isInitialized()) {
|
| NetworkChangeNotifier.init(context2);
|
| }
|
| - if (mOfflinePageBridge.isOfflinePageModelLoaded()) {
|
| - semaphore.release();
|
| - } else {
|
| - mOfflinePageBridge.addObserver(new OfflinePageModelObserver() {
|
| - @Override
|
| - public void offlinePageModelLoaded() {
|
| - semaphore.release();
|
| - mOfflinePageBridge.removeObserver(this);
|
| - }
|
| - });
|
| - }
|
| }
|
| });
|
| - assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
|
|
|
| mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
|
| }
|
|
|