Fix flaky Android Search Geolocation Disclosure tests.

chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
index 83a3c5fb9e2b388338cbd22739024e6ffc8c7122..f1524a4f6f88b8488b0beb6d4106d27f516b222b 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
@@ -9,6 +9,10 @@ import android.view.View;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.infobar.InfoBar;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
+
+import java.util.List;
 
 /**
  * Utility functions for dealing with InfoBars.
@@ -71,4 +75,16 @@ public class InfoBarUtil {
     public static boolean clickSecondaryButton(InfoBar infoBar) {
         return findButton(infoBar, R.id.button_secondary, true);
     }
+
+    /**
+     * Waits until the specified InfoBar list contains no info bars.
+     */
+    public static void waitUntilNoInfoBarsExist(final List<InfoBar> infoBars) {
+        CriteriaHelper.pollUiThread(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return infoBars.isEmpty();
+            }
+        });
+    }
 }