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

Unified Diff: chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc

Issue 2802013002: Move BrowsingDataRemoverImpl:: CompletionInhibitor to the public interface (Closed)
Patch Set: Finishing after shutdown is still OK. Created 3 years, 8 months 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/browsing_data/browsing_data_remover_impl_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc
index 53518b5ead71b2a08532af400541c7080ad78098..0c344446a84623acbbe33d09d2c98929a1976fea 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc
@@ -1438,12 +1438,12 @@ class InspectableCompletionObserver
};
TEST_F(BrowsingDataRemoverImplTest, CompletionInhibition) {
- // The |completion_inhibitor| on the stack should prevent removal sessions
- // from completing until after ContinueToCompletion() is called.
- BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
-
BrowsingDataRemoverImpl* remover = static_cast<BrowsingDataRemoverImpl*>(
BrowsingDataRemoverFactory::GetForBrowserContext(GetBrowserContext()));
+
+ // The |completion_inhibitor| on the stack should prevent removal sessions
+ // from completing until after ContinueToCompletion() is called.
+ BrowsingDataRemoverCompletionInhibitor completion_inhibitor(remover);
InspectableCompletionObserver completion_observer(remover);
remover->RemoveAndReply(
base::Time(), base::Time::Max(), BrowsingDataRemover::DATA_TYPE_COOKIES,
@@ -1473,12 +1473,13 @@ TEST_F(BrowsingDataRemoverImplTest, EarlyShutdown) {
BrowsingDataRemoverImpl* remover = static_cast<BrowsingDataRemoverImpl*>(
BrowsingDataRemoverFactory::GetForBrowserContext(GetBrowserContext()));
InspectableCompletionObserver completion_observer(remover);
- BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
+ BrowsingDataRemoverCompletionInhibitor completion_inhibitor(remover);
remover->RemoveAndReply(
base::Time(), base::Time::Max(), BrowsingDataRemover::DATA_TYPE_COOKIES,
BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, &completion_observer);
completion_inhibitor.BlockUntilNearCompletion();
+ completion_inhibitor.Reset();
// Verify that the deletion has not yet been completed and the observer has
// not been called.
@@ -1590,7 +1591,7 @@ TEST_F(BrowsingDataRemoverImplTest, MultipleTasks) {
filter_builder_2->AddRegisterableDomain("example.com");
MultipleTasksObserver observer(remover);
- BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
+ BrowsingDataRemoverCompletionInhibitor completion_inhibitor(remover);
// Test several tasks with various configuration of masks, filters, and target
// observers.

Powered by Google App Engine
This is Rietveld 408576698