Fix Physical Web WebUI broken favicon

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
@@ skipping 68 matching lines @@
     public UrlManager() {
         Context context = ContextUtils.getApplicationContext();
         mPwsClient = new PwsClientImpl(context);
         mObservers = new ObserverList<Listener>();
         mNearbyUrls = new HashSet<>();
         mUrlInfoMap = new HashMap<>();
         mPwsResultMap = new HashMap<>();
         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).getLastSeenTimestamp());
+                Long timestamp2 = Long.valueOf(mUrlInfoMap.get(url2).getLastSeenTimestamp());
+                return timestamp1.compareTo(timestamp2);
             }
         });
         initSharedPreferences();
         registerNativeInitStartupCallback();
     }
 
     // "Initialization on demand holder idiom"
     private static class LazyHolder {
         private static final UrlManager INSTANCE = new UrlManager();
     }
@@ skipping 142 matching lines @@
      *                                    which will receive the list of nearby URL metadata.
      */
     @CalledByNative
     public void getPwCollection(long nativePhysicalWebCollection) {
         List<UrlInfo> nearbyUrlInfos = getUrlInfoList(mNearbyUrls);
         for (UrlInfo urlInfo : nearbyUrlInfos) {
             String requestUrl = urlInfo.getUrl();
             PwsResult pwsResult = mPwsResultMap.get(requestUrl);
             if (pwsResult != null) {
                 nativeAppendMetadataItem(nativePhysicalWebCollection, requestUrl,
-                        urlInfo.getDistance(), urlInfo.getScanTimestamp(), pwsResult.siteUrl,
+                        urlInfo.getDistance(), urlInfo.getLastSeenTimestamp(), pwsResult.siteUrl,
                         pwsResult.iconUrl, pwsResult.title, pwsResult.description,
                         pwsResult.groupId);
             }
         }
     }
 
     /**
      * Forget all stored URLs.
      */
     public void clearAllUrls() {
@@ skipping 151 matching lines @@
             } catch (JSONException e) {
                 Log.e(TAG, "Could not serialize PwsResult", e);
             }
         }
 
         setStringSetInSharedPreferences(PREFS_PWS_RESULTS_KEY, serializedPwsResults);
     }
 
     /**
      * 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, a subset of its metadata should update.  Only distance fall

[mattreynolds, 2017/02/22 23:33:42]

How about: "When we reencounter a URL, only its distance should update."

[Ran, 2017/02/23 19:44:14]

Done.

+     * into this category.
      * @param urlInfo This should be a freshly discovered UrlInfo, though it does not have to be
      * previously undiscovered.
      * @return The updated cache entry
      */
     private UrlInfo updateCacheEntry(UrlInfo urlInfo) {
         UrlInfo currentUrlInfo = mUrlInfoMap.get(urlInfo.getUrl());
         if (currentUrlInfo == null) {
             mUrlInfoMap.put(urlInfo.getUrl(), urlInfo);
             currentUrlInfo = urlInfo;
         } else {
             mUrlsSortedByTimestamp.remove(urlInfo.getUrl());
-            currentUrlInfo.setScanTimestamp(urlInfo.getScanTimestamp());
             if (urlInfo.getDistance() > 0.0) {
                 currentUrlInfo.setDistance(urlInfo.getDistance());
             }
             if (urlInfo.getDeviceAddress() != null) {
                 currentUrlInfo.setDeviceAddress(urlInfo.getDeviceAddress());
             }
         }
         mUrlsSortedByTimestamp.add(urlInfo.getUrl());
         return currentUrlInfo;
     }
@@ skipping 35 matching lines @@
         safeNotifyNativeListenersOnFound(urlInfo.getUrl());
         if (urlInfo.getDistance() >= 0.0) {
             safeNotifyNativeListenersOnDistanceChanged(urlInfo.getUrl(), urlInfo.getDistance());
         }
     }
 
     private void garbageCollect() {
         for (String url = mUrlsSortedByTimestamp.peek(); url != null;
                 url = mUrlsSortedByTimestamp.peek()) {
             UrlInfo urlInfo = mUrlInfoMap.get(url);
-            if ((System.currentTimeMillis() - urlInfo.getScanTimestamp() <= MAX_CACHE_TIME
+            if ((System.currentTimeMillis() - urlInfo.getLastSeenTimestamp() <= MAX_CACHE_TIME
                     && mUrlsSortedByTimestamp.size() <= MAX_CACHE_SIZE)
                     || mNearbyUrls.contains(url)) {
                 Log.d(TAG, "Not garbage collecting: ", urlInfo);
                 break;
             }
             Log.d(TAG, "Garbage collecting: ", urlInfo);
             // The min value cannot have changed at this point, so it's OK to just remove via
             // poll().
             mUrlsSortedByTimestamp.poll();
             mUrlInfoMap.remove(url);
@@ skipping 130 matching lines @@
                 || mUrlsSortedByTimestamp.contains(url);
     }
 
     @VisibleForTesting
     int getMaxCacheSize() {
         return MAX_CACHE_SIZE;
     }
 
     private native long nativeInit();
     private native void nativeAppendMetadataItem(long nativePhysicalWebCollection,
-            String requestUrl, double distanceEstimate, long scanTimestamp, String siteUrl,
+            String requestUrl, double distanceEstimate, long lastSeenTimestamp, 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);
     private native void nativeOnDistanceChanged(
             long nativePhysicalWebDataSourceAndroid, String url, double distanceChanged);
-}
+}