Cache PWS Results

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 64aa7de8b1040c04ae3c9370d7eb21d9e84aec82..2e83250d504f6a4efedb368e94157423f2c73774 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
@@ -18,7 +18,9 @@ import org.chromium.content.browser.test.util.CriteriaHelper;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Tests for {@link UrlManager}.
@@ -411,6 +413,8 @@ public class UrlManagerTest extends InstrumentationTestCase {
         UrlManager urlManager = new UrlManager(context);
         List<UrlInfo> urlInfos = urlManager.getUrls();
         assertEquals(2, urlInfos.size());
+        Set<String> resolvedUrls = urlManager.getResolvedUrls();
+        assertEquals(2, resolvedUrls.size());
     }
 
     @SmallTest
@@ -426,21 +430,27 @@ public class UrlManagerTest extends InstrumentationTestCase {
         UrlManager urlManager = new UrlManager(context);
         List<UrlInfo> urlInfos = urlManager.getUrls();
         assertEquals(0, urlInfos.size());
+        Set<String> resolvedUrls = urlManager.getResolvedUrls();
+        assertEquals(0, resolvedUrls.size());
     }
 
     @SmallTest
     public void testUpgradeFromNone() throws Exception {
+        Set<String> oldResolvedUrls = new HashSet<String>();
+        oldResolvedUrls.add("old");
         Context context = getInstrumentation().getTargetContext().getApplicationContext();
         mSharedPreferences.edit()
                 .remove(UrlManager.getVersionKey())
+                .putStringSet("physicalweb_resolved_urls", oldResolvedUrls)
                 .apply();
         new UrlManager(context);
 
-        // Make sure the new prefs are populated.
+        // Make sure the new prefs are populated and old prefs are gone.
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
-                return mSharedPreferences.contains(UrlManager.getVersionKey());
+                return mSharedPreferences.contains(UrlManager.getVersionKey())
+                        && !mSharedPreferences.contains("physicalweb_resolved_urls");
             }
         }, 5000, CriteriaHelper.DEFAULT_POLLING_INTERVAL);