| Index: content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java
|
| diff --git a/content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java b/content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java
|
| index fa52744b48177f70fe94c626c3716b623a662565..17813cfb4c7299a6520022731637394e809bd3d8 100644
|
| --- a/content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java
|
| +++ b/content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java
|
| @@ -23,6 +23,7 @@ import org.junit.Test;
|
| import org.junit.runner.RunWith;
|
| import org.robolectric.Robolectric;
|
| import org.robolectric.annotation.Config;
|
| +import org.robolectric.shadows.ShadowLooper;
|
|
|
| import java.util.ArrayList;
|
|
|
| @@ -278,7 +279,7 @@ public class BindingManagerImplTest {
|
|
|
| // Wait until the posted unbinding tasks get executed and verify that the strong binding was
|
| // removed while the initial binding is not affected.
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertFalse(connection.isStrongBindingBound());
|
| Assert.assertTrue(connection.isInitialBindingBound());
|
| }
|
| @@ -315,7 +316,7 @@ public class BindingManagerImplTest {
|
|
|
| // Wait until the posted unbinding tasks get executed and verify that the strong binding was
|
| // removed while the initial binding is not affected, and the moderate binding is bound.
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertFalse(connection.isStrongBindingBound());
|
| Assert.assertTrue(connection.isInitialBindingBound());
|
| Assert.assertTrue(connection.isModerateBindingBound());
|
| @@ -372,7 +373,7 @@ public class BindingManagerImplTest {
|
| // After initial binding is removed, the connection is no longer oom protected.
|
| manager.setInForeground(connection.getPid(), false);
|
| manager.determinedVisibility(connection.getPid());
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertFalse(message, manager.isOomProtected(connection.getPid()));
|
|
|
| // Add a strong binding, restoring the oom protection.
|
| @@ -429,7 +430,7 @@ public class BindingManagerImplTest {
|
| manager.setInForeground(thirdConnection.getPid(), false);
|
|
|
| // Sanity check: verify that no connection has a strong binding.
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertFalse(message, firstConnection.isStrongBindingBound());
|
| Assert.assertFalse(message, secondConnection.isStrongBindingBound());
|
| Assert.assertFalse(message, thirdConnection.isStrongBindingBound());
|
| @@ -445,7 +446,7 @@ public class BindingManagerImplTest {
|
|
|
| // Call onBroughtToForeground() and verify that the strong binding was removed.
|
| manager.onBroughtToForeground();
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertFalse(message, firstConnection.isStrongBindingBound());
|
| Assert.assertFalse(message, secondConnection.isStrongBindingBound());
|
| Assert.assertFalse(message, thirdConnection.isStrongBindingBound());
|
| @@ -473,7 +474,7 @@ public class BindingManagerImplTest {
|
| for (MockChildProcessConnection connection : connections) {
|
| manager.setInForeground(connection.getPid(), true);
|
| manager.setInForeground(connection.getPid(), false);
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertTrue(connection.isModerateBindingBound());
|
| }
|
|
|
| @@ -483,7 +484,7 @@ public class BindingManagerImplTest {
|
| manager.addNewConnection(lastInForeground.getPid(), lastInForeground);
|
| manager.setInForeground(lastInForeground.getPid(), true);
|
| manager.setInForeground(lastInForeground.getPid(), false);
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
|
|
| // Verify that leaving the application for a short time doesn't clear the moderate bindings.
|
| manager.onSentToBackground();
|
| @@ -493,7 +494,7 @@ public class BindingManagerImplTest {
|
| Assert.assertTrue(lastInForeground.isStrongBindingBound());
|
| Assert.assertFalse(lastInForeground.isModerateBindingBound());
|
| manager.onBroughtToForeground();
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| for (MockChildProcessConnection connection : connections) {
|
| Assert.assertTrue(connection.isModerateBindingBound());
|
| }
|
| @@ -506,7 +507,7 @@ public class BindingManagerImplTest {
|
| }
|
| Assert.assertTrue(lastInForeground.isStrongBindingBound());
|
| Assert.assertFalse(lastInForeground.isModerateBindingBound());
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| for (MockChildProcessConnection connection : connections) {
|
| Assert.assertFalse(connection.isModerateBindingBound());
|
| }
|
| @@ -539,7 +540,7 @@ public class BindingManagerImplTest {
|
| for (MockChildProcessConnection connection : connections) {
|
| manager.setInForeground(connection.getPid(), true);
|
| manager.setInForeground(connection.getPid(), false);
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertTrue(connection.isModerateBindingBound());
|
| }
|
|
|
| @@ -581,7 +582,7 @@ public class BindingManagerImplTest {
|
| for (MockChildProcessConnection connection : connections) {
|
| manager.setInForeground(connection.getPid(), true);
|
| manager.setInForeground(connection.getPid(), false);
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertTrue(message, connection.isModerateBindingBound());
|
| }
|
|
|
| @@ -614,7 +615,7 @@ public class BindingManagerImplTest {
|
| for (MockChildProcessConnection connection : connections) {
|
| manager.setInForeground(connection.getPid(), true);
|
| manager.setInForeground(connection.getPid(), false);
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertTrue(connection.isModerateBindingBound());
|
| }
|
|
|
| @@ -710,7 +711,7 @@ public class BindingManagerImplTest {
|
| Assert.assertTrue(connection.isModerateBindingBound());
|
|
|
| manager.onSentToBackground();
|
| - Robolectric.runUiThreadTasksIncludingDelayedTasks();
|
| + ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
|
| Assert.assertFalse(connection.isModerateBindingBound());
|
|
|
| // Bringing Chrome to the foreground should not re-add the moderate bindings.
|
|
|