Fix Physical Web WebUI broken favicon

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 662d8bdb0b70a2746550c85e47145a91b9094c78..c9cc82f13cad66fb92e0fe3ad489d4d3cf2b96d4 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
@@ -86,9 +86,9 @@ class UrlManager {
         mUrlsSortedByTimestamp = new PriorityQueue<String>(1, new Comparator<String>() {
             @Override
             public int compare(String url1, String url2) {
-                Long scanTimestamp1 = Long.valueOf(mUrlInfoMap.get(url1).getScanTimestamp());
-                Long scanTimestamp2 = Long.valueOf(mUrlInfoMap.get(url2).getScanTimestamp());
-                return scanTimestamp1.compareTo(scanTimestamp2);
+                Long timestamp1 = Long.valueOf(mUrlInfoMap.get(url1).getFirstSeenTimestamp());
+                Long timestamp2 = Long.valueOf(mUrlInfoMap.get(url2).getFirstSeenTimestamp());
+                return timestamp1.compareTo(timestamp2);
             }
         });
         initSharedPreferences();
@@ -251,7 +251,7 @@ class UrlManager {
             PwsResult pwsResult = mPwsResultMap.get(requestUrl);
             if (pwsResult != null) {
                 nativeAppendMetadataItem(nativePhysicalWebCollection, requestUrl,
-                        urlInfo.getDistance(), urlInfo.getScanTimestamp(), pwsResult.siteUrl,
+                        urlInfo.getDistance(), urlInfo.getFirstSeenTimestamp(), pwsResult.siteUrl,
                         pwsResult.iconUrl, pwsResult.title, pwsResult.description,
                         pwsResult.groupId);
             }
@@ -423,8 +423,7 @@ class UrlManager {
 
     /**
      * Updates a cache entry with new information.
-     * When we reencounter a URL, a subset of its metadata should update.  Only distance and
-     * scanTimestamp fall into this category.
+     * When we reencounter a URL, only its distance should update.
      * @param urlInfo This should be a freshly discovered UrlInfo, though it does not have to be
      * previously undiscovered.
      * @return The updated cache entry
@@ -436,7 +435,6 @@ class UrlManager {
             currentUrlInfo = urlInfo;
         } else {
             mUrlsSortedByTimestamp.remove(urlInfo.getUrl());
-            currentUrlInfo.setScanTimestamp(urlInfo.getScanTimestamp());
             if (urlInfo.getDistance() > 0.0) {
                 currentUrlInfo.setDistance(urlInfo.getDistance());
             }
@@ -492,8 +490,8 @@ class UrlManager {
         for (String url = mUrlsSortedByTimestamp.peek(); url != null;
                 url = mUrlsSortedByTimestamp.peek()) {
             UrlInfo urlInfo = mUrlInfoMap.get(url);
-            if ((System.currentTimeMillis() - urlInfo.getScanTimestamp() <= MAX_CACHE_TIME
-                    && mUrlsSortedByTimestamp.size() <= MAX_CACHE_SIZE)
+            if ((System.currentTimeMillis() - urlInfo.getFirstSeenTimestamp() <= MAX_CACHE_TIME
+                        && mUrlsSortedByTimestamp.size() <= MAX_CACHE_SIZE)
                     || mNearbyUrls.contains(url)) {
                 Log.d(TAG, "Not garbage collecting: ", urlInfo);
                 break;
@@ -643,7 +641,7 @@ class UrlManager {
 
     private native long nativeInit();
     private native void nativeAppendMetadataItem(long nativePhysicalWebCollection,
-            String requestUrl, double distanceEstimate, long scanTimestamp, String siteUrl,
+            String requestUrl, double distanceEstimate, long firstSeenTimestamp, String siteUrl,
             String iconUrl, String title, String description, String groupId);
     private native void nativeOnFound(long nativePhysicalWebDataSourceAndroid, String url);
     private native void nativeOnLost(long nativePhysicalWebDataSourceAndroid, String url);