[Sync] Attempt to fix a flake in OpenTabsTest.

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
index 7a9950165ec78d31cbcedefea15073f0534f37d5..265dea95f1af71c952db4d879d4c2259cab8ebe5 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
@@ -264,12 +264,16 @@ public class OpenTabsTest extends SyncTestBase {
     }
 
     private String getClientName() throws Exception {
-        pollInstrumentationThread(Criteria.equals(2, new Callable<Integer>() {
+        pollInstrumentationThread(new Criteria("Expected at least one tab entity to exist.") {
             @Override
-            public Integer call() throws Exception {
-                return SyncTestUtil.getLocalData(mContext, OPEN_TABS_TYPE).size();
+            public boolean isSatisfied() {
+                try {
+                    return SyncTestUtil.getLocalData(mContext, OPEN_TABS_TYPE).size() > 0;
+                } catch (JSONException e) {
+                    return false;
+                }
             }
-        }));
+        });
         List<Pair<String, JSONObject>> tabEntities = SyncTestUtil.getLocalData(
                 mContext, OPEN_TABS_TYPE);
         for (Pair<String, JSONObject> tabEntity : tabEntities) {