| Index: base/android/java/src/org/chromium/base/ThreadUtils.java
|
| diff --git a/base/android/java/src/org/chromium/base/ThreadUtils.java b/base/android/java/src/org/chromium/base/ThreadUtils.java
|
| index f95d9ac8cde3238be0a76cb23548a347cac22dc2..dbad59d093fa695f43c060bc1e93873a95295761 100644
|
| --- a/base/android/java/src/org/chromium/base/ThreadUtils.java
|
| +++ b/base/android/java/src/org/chromium/base/ThreadUtils.java
|
| @@ -34,6 +34,11 @@ public class ThreadUtils {
|
| @VisibleForTesting
|
| public static void setUiThread(Looper looper) {
|
| synchronized (sLock) {
|
| + if (looper == null) {
|
| + // Used to reset the looper after tests.
|
| + sUiThreadHandler = null;
|
| + return;
|
| + }
|
| if (sUiThreadHandler != null && sUiThreadHandler.getLooper() != looper) {
|
| throw new RuntimeException("UI thread looper is already set to "
|
| + sUiThreadHandler.getLooper() + " (Main thread looper is "
|
|
|