[MD History] Fix deletion in heavily scrolled list.

chrome/browser/ui/webui/browsing_history_handler_unittest.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/webui/browsing_history_handler.h"
 
 #include <stdint.h>
 #include <memory>
 #include <set>
 
@@ skipping 279 matching lines @@
     handler.RegisterMessages();
     sync_service()->SetSyncActive(true);
 
     web_history_service()->ExpireHistoryBetween(std::set<GURL>(), base::Time(),
                                                 base::Time::Max(), callback);
 
     EXPECT_EQ(2U, web_ui()->call_data().size());
     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.
   {
     sync_service()->SetSyncActive(false);
     BrowsingHistoryHandlerWithWebUIForTesting handler(web_ui());
     handler.RegisterMessages();
 
     web_history_service()->ExpireHistoryBetween(std::set<GURL>(), base::Time(),
                                                 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());
   }
 }
 
 #if !defined(OS_ANDROID)
 TEST_F(BrowsingHistoryHandlerTest, MdTruncatesTitles) {
   MdHistoryUI::SetEnabledForTesting(true);
 
   history::URLResult long_result(
       GURL("http://looooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
       "oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
@@ skipping 19 matching lines @@
   const base::DictionaryValue* first_entry;
   ASSERT_TRUE(arg2->GetDictionary(0, &first_entry));
 
   base::string16 title;
   ASSERT_TRUE(first_entry->GetString("title", &title));
 
   ASSERT_EQ(0u, title.find(base::ASCIIToUTF16("http://loooo")));
   EXPECT_EQ(300u, title.size());
 }
 #endif