Remove partner bookmark caching logic.

This is no longer necessary since we only load partner bookmarks on
demand now.

Bug: 832371
Change-Id: Id6b76f7a8278aace0c682a00cd1d490e11311c73
Reviewed-on: https://chromium-review.googlesource.com/1011582Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Maria Khomenko <mariakhomenko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550706}

chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java

@@ -5,10 +5,8 @@
 package org.chromium.chrome.browser.partnerbookmarks;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.metrics.RecordHistogram;
@@ -29,8 +27,6 @@ public class PartnerBookmarksReader {
     private static Set<FaviconUpdateObserver> sFaviconUpdateObservers = new HashSet<>();
     private static final float DESIRED_FAVICON_SIZE_DP = 16.0f;
 
-    static final String LAST_EMPTY_READ_PREFS_NAME = "PartnerBookmarksReader.last_empty_read";
-
     private static boolean sInitialized;
     private static boolean sForceDisableEditing;
 
@@ -225,17 +221,6 @@ public class PartnerBookmarksReader {
     private class ReadBookmarksTask extends AsyncTask<Void, Void, Void> {
         private final Object mRootSync = new Object();
 
-        private void handleZeroBookmark() {
-            SharedPreferences.Editor editor = ContextUtils.getAppSharedPreferences().edit();
-            editor.putLong(LAST_EMPTY_READ_PREFS_NAME, System.currentTimeMillis());
-            editor.apply();
-            recordPartnerBookmarkCount(0);
-
-            Log.w(TAG,
-                    "Obtained zero partner bookmarks. "
-                            + "Will skip reading partner bookmarks for a while.");
-        }
-
         @Override
         protected Void doInBackground(Void... params) {
             if (mFaviconThrottle == null) {
@@ -245,12 +230,7 @@ public class PartnerBookmarksReader {
             }
             PartnerBookmark.BookmarkIterator bookmarkIterator =
                     AppHooks.get().getPartnerBookmarkIterator();
-            RecordHistogram.recordBooleanHistogram(
-                    "PartnerBookmark.Null", bookmarkIterator == null);
-            if (bookmarkIterator == null) {
-                handleZeroBookmark();
-                return null;
-            }
+            if (bookmarkIterator == null) return null;
 
             // Get a snapshot of the bookmarks.
             LinkedHashMap<Long, PartnerBookmark> idMap = new LinkedHashMap<Long, PartnerBookmark>();
@@ -285,15 +265,6 @@ public class PartnerBookmarksReader {
             int count = urlSet.size();
             recordPartnerBookmarkCount(count);
 
-            if (count == 0) {
-                handleZeroBookmark();
-            } else {
-                SharedPreferences pref = ContextUtils.getAppSharedPreferences();
-                if (pref.contains(LAST_EMPTY_READ_PREFS_NAME)) {
-                    pref.edit().remove(LAST_EMPTY_READ_PREFS_NAME).apply();
-                }
-            }
-
             // Recreate the folder hierarchy and read it.
             recreateFolderHierarchy(idMap);
             if (rootBookmarksFolder.mEntries.size() == 0) {

chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java

@@ -5,16 +5,10 @@
 package org.chromium.chrome.browser.partnerbookmarks;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 
-import org.chromium.base.ContextUtils;
-import org.chromium.base.Log;
-import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * The Java counterpart for the C++ partner bookmarks shim.
  * Responsible for:
@@ -27,7 +21,6 @@ public class PartnerBookmarksShim {
     private static final String TAG = "PartnerBookmarksShim";
 
     private static boolean sIsReadingAttempted;
-    private static final long BAN_DURATION_MS = TimeUnit.DAYS.toMillis(7);
 
     /**
      * Checks if we need to fetch the Partner bookmarks and kicks the reading off. If reading was
@@ -47,28 +40,7 @@ public class PartnerBookmarksShim {
             return;
         }
 
-        boolean skip = shouldSkipReading();
-        RecordHistogram.recordBooleanHistogram("PartnerBookmark.Skipped", skip);
-        if (skip) {
-            Log.i(TAG, "Skip reading partner bookmarks since recent result was empty.");
-            reader.recordPartnerBookmarkCount(0);
-            reader.onBookmarksRead();
-            return;
-        }
         reader.readBookmarks();
     }
 
-    private static boolean shouldSkipReading() {
-        SharedPreferences pref = ContextUtils.getAppSharedPreferences();
-        long last = pref.getLong(PartnerBookmarksReader.LAST_EMPTY_READ_PREFS_NAME, 0);
-        int elapsed = (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - last);
-
-        if (last > 0) {
-            RecordHistogram.recordCustomCountHistogram("PartnerBookmark.TimeSinceLastEmptyRead2",
-                    elapsed, 1, (int) TimeUnit.DAYS.toSeconds(365), 50);
-        }
-        // Without checking elapsed >= 0, we might get stuck at an "always skip mode" if
-        // |LAST_EMPTY_READ_PREFS_NAME| is a bogus future time.
-        return 0 <= elapsed && elapsed < BAN_DURATION_MS;
-    }
 }

tools/metrics/histograms/histograms.xml

@@ -63029,6 +63029,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="PartnerBookmark.Null" enum="BooleanNull">
+  <obsolete>
+    No longer recorded as of Apr 2018
+  </obsolete>
   <owner>wychen@chromium.org</owner>
   <summary>
     Whether there's no partner bookmark provider. By default, the system image
@@ -63039,6 +63042,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="PartnerBookmark.Skipped" enum="BooleanSkipped">
+  <obsolete>
+    No longer recorded as of Apr 2018
+  </obsolete>
   <owner>wychen@chromium.org</owner>
   <summary>
     Whether reading of partner bookmark is skipped. Logged when using the
@@ -63059,6 +63065,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="PartnerBookmark.TimeSinceLastEmptyRead2" units="seconds">
+  <obsolete>
+    No longer recorded as of Apr 2018
+  </obsolete>
   <owner>wychen@chromium.org</owner>
   <summary>
     When trying to load the partner bookmarks, if no partner bookmark is read