Respect time range in browsing data removal for last-visited data.

components/ntp_snippets/bookmarks/bookmark_suggestions_provider.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_suggestions_provider.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 131 matching lines @@
           callback,
           Status(StatusCode::PERMANENT_ERROR,
                  "BookmarkSuggestionsProvider has no |Fetch| functionality!"),
           base::Passed(std::vector<ContentSuggestion>())));
 }
 
 void BookmarkSuggestionsProvider::ClearHistory(
     base::Time begin,
     base::Time end,
     const base::Callback<bool(const GURL& url)>& filter) {
-  // The last visit dates are not "owned" by the bookmark suggestion provider so
-  // it is cleared directly from browsing_data_remover.cc.
+  // To avoid race conditions with the history-removal of the last-visited
+  // timestamps we also trigger a deletion here. The problem is that we need to
+  // update the bookmarks data here and otherwise (depending on the order in
+  // which the code runs) could pick up to-be-deleted data again.
+  if (bookmark_model_->loaded()) {
+    RemoveLastVisitedDatesBetween(begin, end, filter, bookmark_model_);
+  }
   ClearDismissedSuggestionsForDebugging(provided_category_);
-  // TODO(tschumann): Before re-fetching bookmarks we need to trigger a clean-up
-  // of the last-visit dates -- otherwise we depend on the order in which the
-  // ClearHistory events are done and might just pick-up to-be-deleted data
-  // again.
   FetchBookmarks();
 }
 
 void BookmarkSuggestionsProvider::ClearCachedSuggestions(Category category) {
   DCHECK_EQ(category, provided_category_);
   // Ignored.
 }
 
 void BookmarkSuggestionsProvider::GetDismissedSuggestionsForDebugging(
     Category category,
@@ skipping 151 matching lines @@
 void BookmarkSuggestionsProvider::NotifyStatusChanged(
     CategoryStatus new_status) {
   if (category_status_ == new_status) {
     return;
   }
   category_status_ = new_status;
   observer()->OnCategoryStatusChanged(this, provided_category_, new_status);
 }
 
 }  // namespace ntp_snippets