Move BrowsingDataRemoverImpl:: CompletionInhibitor to the public interface

chrome/browser/browsing_data/browsing_data_remover_impl.cc

Index: chrome/browser/browsing_data/browsing_data_remover_impl.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_impl.cc b/chrome/browser/browsing_data/browsing_data_remover_impl.cc
index 68de911c55f96e185d6238384b436518978b2b49..5312b6a476d02c905448b96c6465cdc7d527a519 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_impl.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_impl.cc
@@ -151,9 +151,6 @@ void ClearChannelIDsOnIOThread(
 
 }  // namespace
 
-BrowsingDataRemoverImpl::CompletionInhibitor*
-    BrowsingDataRemoverImpl::completion_inhibitor_ = nullptr;
-
 BrowsingDataRemoverImpl::SubTask::SubTask(const base::Closure& forward_callback)
     : is_pending_(false),
       forward_callback_(forward_callback),
@@ -196,6 +193,7 @@ BrowsingDataRemoverImpl::BrowsingDataRemoverImpl(
       clear_channel_ids_(sub_task_forward_callback_),
       clear_http_auth_cache_(sub_task_forward_callback_),
       clear_storage_partition_data_(sub_task_forward_callback_),
+      storage_partition_for_testing_(nullptr),
       weak_ptr_factory_(this) {
   DCHECK(browser_context_);
 }
@@ -577,6 +575,12 @@ void BrowsingDataRemoverImpl::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
+void BrowsingDataRemoverImpl::SetWouldCompleteCallbackForTesting(
+    const base::Callback<void(const base::Closure& continue_to_completion)>&
+        callback) {
+  would_complete_callback_ = callback;
+}
+
 void BrowsingDataRemoverImpl::OverrideStoragePartitionForTesting(
     content::StoragePartition* storage_partition) {
   storage_partition_for_testing_ = storage_partition;
@@ -598,6 +602,10 @@ int BrowsingDataRemoverImpl::GetLastUsedOriginTypeMask() {
   return origin_type_mask_;
 }
 
+base::WeakPtr<BrowsingDataRemover> BrowsingDataRemoverImpl::GetWeakPtr() {
+  return GetImplWeakPtr();
+}
+
 BrowsingDataRemoverImpl::RemovalTask::RemovalTask(
     const base::Time& delete_begin,
     const base::Time& delete_end,
@@ -656,7 +664,7 @@ void BrowsingDataRemoverImpl::Notify() {
   // are scheduled.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&BrowsingDataRemoverImpl::RunNextTask, GetWeakPtr()));
+      base::Bind(&BrowsingDataRemoverImpl::RunNextTask, GetImplWeakPtr()));
 }
 
 void BrowsingDataRemoverImpl::NotifyIfDone() {
@@ -667,16 +675,17 @@ void BrowsingDataRemoverImpl::NotifyIfDone() {
   if (!AllDone())
     return;
 
-  if (completion_inhibitor_) {
-    completion_inhibitor_->OnBrowsingDataRemoverWouldComplete(
-        this, base::Bind(&BrowsingDataRemoverImpl::Notify, GetWeakPtr()));
+  if (!would_complete_callback_.is_null()) {
+    would_complete_callback_.Run(
+        base::Bind(&BrowsingDataRemoverImpl::Notify, GetImplWeakPtr()));
     return;
   }
 
   Notify();
 }
 
-base::WeakPtr<BrowsingDataRemoverImpl> BrowsingDataRemoverImpl::GetWeakPtr() {
+base::WeakPtr<BrowsingDataRemoverImpl>
+BrowsingDataRemoverImpl::GetImplWeakPtr() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::WeakPtr<BrowsingDataRemoverImpl> weak_ptr =
       weak_ptr_factory_.GetWeakPtr();