[Offline pages] Filter out offline pages without matching bookmarks i…

…n UI

Making sure that when offline page filter is applied, all of the
bookmark IDs are checked against the bookmark model, before being
used by UI.

BUG=537806

Review URL: https://codereview.chromium.org/1470403002

Cr-Commit-Position: refs/heads/master@{#362185}
(cherry picked from commit f2d8e24)

Review URL: https://codereview.chromium.org/1486753005 .

Cr-Commit-Position: refs/branch-heads/2564@{#186}
Cr-Branched-From: 1283eca-refs/heads/master@{#359700}

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java

@@ -27,6 +27,7 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -327,9 +328,17 @@ public List<BookmarkId> getBookmarkIDsByFilter(EnhancedBookmarkFilter filter) {
 
         List<OfflinePageItem> offlinePages = mOfflinePageBridge.getAllPages();
         Collections.sort(offlinePages, sOfflinePageComparator);
+
+        // We are going to filter out all of the offline pages without a matching bookmark.
+        // http://crbug.com/537806
+        HashSet<BookmarkId> existingBookmarks =
+                new HashSet<BookmarkId>(getAllBookmarkIDsOrderedByCreationDate());
+
         List<BookmarkId> bookmarkIds = new ArrayList<BookmarkId>();
         for (OfflinePageItem offlinePage : offlinePages) {
-            bookmarkIds.add(offlinePage.getBookmarkId());
+            if (existingBookmarks.contains(offlinePage.getBookmarkId())) {
+                bookmarkIds.add(offlinePage.getBookmarkId());
+            }
         }
         return bookmarkIds;
     }