Don't cache invalid serialized Physical Web URLs

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
index ad1c382ecba0c36968f083c10f8d03afd211273b..b34206fb904f0f9daca62d5b27052bf75ee91a2d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
@@ -401,7 +401,6 @@ class UrlManager {
         }
 
         // Read the cache.
-        mNearbyUrls.addAll(prefs.getStringSet(PREFS_NEARBY_URLS_KEY, new HashSet<String>()));
         for (String serializedUrl : prefs.getStringSet(PREFS_ALL_URLS_KEY, new HashSet<String>())) {
             try {
                 JSONObject jsonObject = new JSONObject(serializedUrl);
@@ -412,6 +411,8 @@ class UrlManager {
                 Log.e(TAG, "Could not deserialize UrlInfo", e);
             }
         }
+        mNearbyUrls.addAll(prefs.getStringSet(PREFS_NEARBY_URLS_KEY, new HashSet<String>()));
+        mNearbyUrls.retainAll(mUrlInfoMap.keySet());
         for (String serializedPwsResult : prefs.getStringSet(PREFS_PWS_RESULTS_KEY,
                 new HashSet<String>())) {
             try {