💥 Fix crash when removing persistent Snackbar.

When calling SnackbarManager#dismissSnackbars with a persistent
snackbar, you get an IllegalStateException from Iterator#remove.

This is because we attempt to remove the persistent Snackbar from
the list of non-persistent Snackbars.

This CL splits out the logic so we iterate through the persistent
and non-persistent Snackbar deques separately.

Bug: none
Change-Id: I620ba14fd1eaa75ab5ba6a34870655218bd3fd22
Reviewed-on: https://chromium-review.googlesource.com/1179672
Commit-Queue: Peter Conn <peconn@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584074}

chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarCollection.java

@@ -102,32 +102,44 @@ class SnackbarCollection {
     }
 
     boolean removeMatchingSnackbars(SnackbarController controller) {
+        return removeSnackbarFromList(mSnackbars, controller)
+                || removeSnackbarFromList(mPersistentSnackbars, controller);
+    }
+
+    private static boolean removeSnackbarFromList(Deque<Snackbar> list,
+            SnackbarController controller) {
         boolean snackbarRemoved = false;
-        Iterator<Snackbar> iter = mSnackbars.iterator();
-        Iterator<Snackbar> persistentIter = mPersistentSnackbars.iterator();
-        while (iter.hasNext() || persistentIter.hasNext()) {
-            Snackbar snackbar = iter.hasNext() ? iter.next() : persistentIter.next();
-            if (snackbar.getController() == controller) {
-                iter.remove();
-                controller.onDismissNoAction(snackbar.getActionData());
-                snackbarRemoved = true;
-            }
+        Iterator<Snackbar> iter = list.iterator();
+        while (iter.hasNext()) {
+            Snackbar snackbar = iter.next();
+
+            if (snackbar.getController() != controller) continue;
+
+            iter.remove();
+            controller.onDismissNoAction(snackbar.getActionData());
+            snackbarRemoved = true;
         }
         return snackbarRemoved;
     }
 
     boolean removeMatchingSnackbars(SnackbarController controller, Object data) {
+        return removeSnackbarFromList(mSnackbars, controller, data)
+                || removeSnackbarFromList(mPersistentSnackbars, controller, data);
+    }
+
+    private static boolean removeSnackbarFromList(Deque<Snackbar> list,
+            SnackbarController controller, Object data) {
         boolean snackbarRemoved = false;
-        Iterator<Snackbar> iter = mSnackbars.iterator();
-        Iterator<Snackbar> persistentIter = mPersistentSnackbars.iterator();
-        while (iter.hasNext() || persistentIter.hasNext()) {
-            Snackbar snackbar = iter.hasNext() ? iter.next() : persistentIter.next();
-            if (snackbar.getController() == controller
-                    && objectsAreEqual(snackbar.getActionData(), data)) {
-                iter.remove();
-                controller.onDismissNoAction(data);
-                snackbarRemoved = true;
-            }
+        Iterator<Snackbar> iter = list.iterator();
+        while (iter.hasNext()) {
+            Snackbar snackbar = iter.next();
+
+            if (snackbar.getController() != controller) continue;
+            if (!objectsAreEqual(snackbar.getActionData(), data)) continue;
+
+            iter.remove();
+            controller.onDismissNoAction(snackbar.getActionData());
+            snackbarRemoved = true;
         }
         return snackbarRemoved;
     }