Gather data on Physical Web cached URL scenario

chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
index 0017212775557928d1e500ddee75a2068b4e7939..843eeafd98ae859fde8547b527e7a7976b49b0c6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
@@ -10,7 +10,7 @@ import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ContextUtils;
-import org.chromium.base.test.util.DisabledTest;
+import org.chromium.base.test.util.FlakyTest;
 import org.chromium.chrome.test.util.browser.notifications.MockNotificationManagerProxy;
 import org.chromium.chrome.test.util.browser.notifications.MockNotificationManagerProxy.NotificationEntry;
 import org.chromium.content.browser.test.util.Criteria;
@@ -230,8 +230,8 @@ public class UrlManagerTest extends InstrumentationTestCase {
         assertTrue(mUrlManager.containsInAnyCache(URL2));
     }
 
-    //@SmallTest
-    @DisabledTest // crbug.com/622005
+    @SmallTest
+    @FlakyTest  // crbug.com/622005
     public void testAddUrlInCacheWithOthersMakesNoNotification() throws Exception {
         addPwsResult1();
         addPwsResult2();
@@ -240,6 +240,10 @@ public class UrlManagerTest extends InstrumentationTestCase {
         mUrlManager.addUrl(URL2);
         mUrlManager.removeUrl(URL1);
         getInstrumentation().waitForIdleSync();
+
+        // Make sure the cache is in the appropriate state
+        assertTrue(mUrlManager.containsInAnyCache(URL1));
+
         mMockNotificationManagerProxy.cancelAll();
         mUrlManager.addUrl(URL1);
         getInstrumentation().waitForIdleSync();