Update bookmark suggestions also after undismiss/delete.

components/ntp_snippets/bookmarks/bookmark_last_visit_utils.cc

 // Copyright 2016 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.
 
 #include "components/ntp_snippets/bookmarks/bookmark_last_visit_utils.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 51 matching lines @@
   std::string last_visit_date_string;
   node->GetMetaInfo(kBookmarkLastVisitDateKey, &last_visit_date_string);
 
   // Use creation date if no last visit info present.
   if (last_visit_date_string.empty())
     return node->date_added();
 
   return ParseLastVisitDate(last_visit_date_string);
 }
 
+base::Time GetLastVisitDateForBookmarkIfNotDismissed(const BookmarkNode* node) {
+  if (IsDismissedFromNTPForBookmark(node))
+    return base::Time::UnixEpoch();
+
+  return GetLastVisitDateForBookmark(node);
+}
+
 void MarkBookmarksDismissed(BookmarkModel* bookmark_model, const GURL& url) {
   std::vector<const BookmarkNode*> nodes;
   bookmark_model->GetNodesByURL(url, &nodes);
   for (const BookmarkNode* node : nodes)
     bookmark_model->SetNodeMetaInfo(node, kBookmarkDismissedFromNTP, "1");
 }
 
 bool IsDismissedFromNTPForBookmark(const BookmarkNode* node) {
   if (!node)
     return false;
@@ skipping 20 matching lines @@
 }
 
 std::vector<const BookmarkNode*> GetRecentlyVisitedBookmarks(
     BookmarkModel* bookmark_model,
     int max_count,
     const base::Time& min_visit_time) {
   // Get all the bookmark URLs.
   std::vector<BookmarkModel::URLAndTitle> bookmarks;
   bookmark_model->GetBookmarks(&bookmarks);
 
-  // Remove the bookmark URLs whose bookmarks are all dismissed or whose most
-  // recent visit is older than |min_visit_time|.
+  // Remove the URLs for that no bookmark has a recent visit (more recent than
+  // |min_visit_time|). Recent visits to dismissed bookmarks are not considered.
   bookmarks.erase(
       std::remove_if(bookmarks.begin(), bookmarks.end(),
                      [&bookmark_model, &min_visit_time](
                          const BookmarkModel::URLAndTitle& bookmark) {
                        // Get all bookmarks for the given URL.
                        std::vector<const BookmarkNode*> bookmarks_for_url;
                        bookmark_model->GetNodesByURL(bookmark.url,
                                                      &bookmarks_for_url);
 
-                       // Check if there is a recently visited bookmark and not
-                       // all bookmarks are dismissed.
-                       bool has_recent_visit = false;
-                       bool all_dismissed = true;
+                       // Keep if at least one (non-dismissed) bookmark has been
+                       // recently visited.
                        for (const BookmarkNode* node : bookmarks_for_url) {
-                         if (GetLastVisitDateForBookmark(node) > min_visit_time)
-                           has_recent_visit = true;
-                         if (!IsDismissedFromNTPForBookmark(node))
-                           all_dismissed = false;
+                         if (GetLastVisitDateForBookmarkIfNotDismissed(node) >
+                             min_visit_time)
+                           return false;
                        }
-                       return all_dismissed || !has_recent_visit;
+                       // Otherwise erase this URL.
+                       return true;
                      }),
       bookmarks.end());
 
   // Sort the remaining bookmarks by date.
   std::sort(bookmarks.begin(), bookmarks.end(),
             [&bookmark_model](const BookmarkModel::URLAndTitle& a,
                               const BookmarkModel::URLAndTitle& b) {
               return CompareBookmarksByLastVisitDate(
                   bookmark_model->GetMostRecentlyAddedUserNodeForURL(a.url),
                   bookmark_model->GetMostRecentlyAddedUserNodeForURL(b.url));
@@ skipping 35 matching lines @@
   // Insert into |result|.
   std::vector<const BookmarkNode*> result;
   for (const BookmarkModel::URLAndTitle& bookmark : bookmarks) {
     result.push_back(
         bookmark_model->GetMostRecentlyAddedUserNodeForURL(bookmark.url));
   }
   return result;
 }
 
 }  // namespace ntp_snippets