Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3656)

Unified Diff: chrome/browser/ui/webui/browsing_history_handler_unittest.cc

Issue 2455503004: [MD History] Fix deletion in heavily scrolled list. (Closed)
Patch Set: add test Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/browsing_history_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
index 97b9bfcbd424413d4a1f4aa666d6e0020de1a35f..0d026cb40f5f189bf942fcc3426bed5bfca3ecf2 100644
--- a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
+++ b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
@@ -297,6 +297,25 @@ TEST_F(BrowsingHistoryHandlerTest, ObservingWebHistoryDeletions) {
EXPECT_EQ("historyDeleted", web_ui()->call_data().back()->function_name());
}
+ // BrowsingHistoryHandler does not fire historyDeleted while a web history
+ // delete request is happening.
+ {
+ sync_service()->SetSyncActive(true);
+ BrowsingHistoryHandlerWithWebUIForTesting handler(web_ui());
+ handler.RegisterMessages();
+
+ // Simulate an ongoing delete request.
+ handler.has_pending_delete_request_ = true;
+
+ web_history_service()->ExpireHistoryBetween(
+ std::set<GURL>(), base::Time(), base::Time::Max(),
+ base::Bind(&BrowsingHistoryHandler::RemoveWebHistoryComplete,
+ handler.weak_factory_.GetWeakPtr()));
+
+ EXPECT_EQ(3U, web_ui()->call_data().size());
+ EXPECT_EQ("deleteComplete", web_ui()->call_data().back()->function_name());
+ }
+
// When history sync is not active, we don't listen to WebHistoryService
// deletions. The WebHistoryService object still exists (because it's a
// BrowserContextKeyedService), but is not visible to BrowsingHistoryHandler.
@@ -309,7 +328,7 @@ TEST_F(BrowsingHistoryHandlerTest, ObservingWebHistoryDeletions) {
base::Time::Max(), callback);
// No additional WebUI calls were made.
- EXPECT_EQ(2U, web_ui()->call_data().size());
+ EXPECT_EQ(3U, web_ui()->call_data().size());
}
}

Powered by Google App Engine
This is Rietveld 408576698