ntp_snippets: Use base::EraseIf()

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 <numeric>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"

[Marc Treib, 2017/03/10 10:38:58]

#include "base/stl_util.h"

 #include "base/time/time.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "url/gurl.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace ntp_snippets {
 
 namespace {
 
 struct RecentBookmark {
   const bookmarks::BookmarkNode* node;
   base::Time last_visited;
 };
 
-const char* kBookmarksURLBlacklist[] = {"chrome://newtab/",
-                                        "chrome-native://newtab/",
-                                        "chrome://bookmarks/"};
+const char* kBookmarksURLBlacklist[] = {
+    "chrome://newtab/", "chrome-native://newtab/", "chrome://bookmarks/"};
 
 const char kBookmarkLastVisitDateOnMobileKey[] = "last_visited";
 const char kBookmarkLastVisitDateOnDesktopKey[] = "last_visited_desktop";
 const char kBookmarkDismissedFromNTP[] = "dismissed_from_ntp";
 
 std::string FormatLastVisitDate(const base::Time& date) {
   return base::Int64ToString(date.ToInternalValue());
 }
 
 bool ExtractLastVisitDate(const BookmarkNode& node,
@@ skipping 54 matching lines @@
   // Skip URLs that are not bookmarked.
   std::vector<const BookmarkNode*> bookmarks_for_url;
   bookmark_model->GetNodesByURL(url, &bookmarks_for_url);
   if (bookmarks_for_url.empty()) {
     return;
   }
 
   // If there are bookmarks for |url|, set their last visit date to now.
   std::string now = FormatLastVisitDate(base::Time::Now());
   for (const BookmarkNode* node : bookmarks_for_url) {
-    bookmark_model->SetNodeMetaInfo(
-        node, is_mobile_platform ? kBookmarkLastVisitDateOnMobileKey
-                                 : kBookmarkLastVisitDateOnDesktopKey,
-        now);
+    bookmark_model->SetNodeMetaInfo(node,
+                                    is_mobile_platform
+                                        ? kBookmarkLastVisitDateOnMobileKey
+                                        : kBookmarkLastVisitDateOnDesktopKey,
+                                    now);
     // If the bookmark has been dismissed from NTP before, a new visit overrides
     // such a dismissal.
     bookmark_model->DeleteNodeMetaInfo(node, kBookmarkDismissedFromNTP);
   }
 }
 
 bool GetLastVisitDateForNTPBookmark(const BookmarkNode& node,
                                     bool consider_visits_from_desktop,
                                     base::Time* out) {
   if (IsDismissedFromNTPForBookmark(node)) {
@@ skipping 113 matching lines @@
   return result;
 }
 
 std::vector<const BookmarkNode*> GetDismissedBookmarksForDebugging(
     BookmarkModel* bookmark_model) {
   // Get all the bookmark URLs.
   std::vector<BookmarkModel::URLAndTitle> bookmarks;
   bookmark_model->GetBookmarks(&bookmarks);
 
   // Remove the bookmark URLs which have at least one non-dismissed bookmark.
-  bookmarks.erase(
-      std::remove_if(
-          bookmarks.begin(), bookmarks.end(),
-          [&bookmark_model](const BookmarkModel::URLAndTitle& bookmark) {
-            std::vector<const BookmarkNode*> bookmarks_for_url;
-            bookmark_model->GetNodesByURL(bookmark.url, &bookmarks_for_url);
-            DCHECK(!bookmarks_for_url.empty());
+  base::EraseIf(
+      bookmarks, [&bookmark_model](const BookmarkModel::URLAndTitle& bookmark) {
+        std::vector<const BookmarkNode*> bookmarks_for_url;
+        bookmark_model->GetNodesByURL(bookmark.url, &bookmarks_for_url);
+        DCHECK(!bookmarks_for_url.empty());
 
-            for (const BookmarkNode* node : bookmarks_for_url) {
-              if (!IsDismissedFromNTPForBookmark(*node)) {
-                return true;
-              }
-            }
-            return false;
-          }),
-      bookmarks.end());
+        for (const BookmarkNode* node : bookmarks_for_url) {
+          if (!IsDismissedFromNTPForBookmark(*node)) {
+            return true;
+          }
+        }
+        return false;
+      });
 
   // Insert into |result|.
   std::vector<const BookmarkNode*> result;
   for (const BookmarkModel::URLAndTitle& bookmark : bookmarks) {
     result.push_back(
         bookmark_model->GetMostRecentlyAddedUserNodeForURL(bookmark.url));
   }
   return result;
 }
 
@@ skipping 27 matching lines @@
     }
     // Get all bookmarks for the given URL.
     std::vector<const BookmarkNode*> bookmarks_for_url;
     bookmark_model->GetNodesByURL(url_and_title.url, &bookmarks_for_url);
 
     for (const BookmarkNode* bookmark : bookmarks_for_url) {
       // The dismissal metadata is managed by the BookmarkSuggestionsProvider.
       ClearLastVisitedMetadataIfBetween(bookmark_model, *bookmark, begin, end,
                                         kBookmarkLastVisitDateOnMobileKey);
       ClearLastVisitedMetadataIfBetween(bookmark_model, *bookmark, begin, end,
-                                kBookmarkLastVisitDateOnDesktopKey);
+                                        kBookmarkLastVisitDateOnDesktopKey);
     }
   }
 }
 
 }  // namespace ntp_snippets