Move BrowsingDataRemoverImpl:: CompletionInhibitor to the public interface

chrome/browser/browsing_data/browsing_data_remover_impl.cc

 // Copyright (c) 2012 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/browsing_data/browsing_data_remover_impl.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 133 matching lines @@
   net::ChannelIDService* channel_id_service =
       rq_context->GetURLRequestContext()->channel_id_service();
   channel_id_service->GetChannelIDStore()->DeleteForDomainsCreatedBetween(
       domain_predicate, delete_begin, delete_end,
       base::Bind(&OnClearedChannelIDsOnIOThread,
                  base::RetainedRef(std::move(rq_context)), callback));
 }
 
 }  // namespace
 
-BrowsingDataRemoverImpl::CompletionInhibitor*
-    BrowsingDataRemoverImpl::completion_inhibitor_ = nullptr;
-
 BrowsingDataRemoverImpl::SubTask::SubTask(const base::Closure& forward_callback)
     : is_pending_(false),
       forward_callback_(forward_callback),
       weak_ptr_factory_(this) {
   DCHECK(!forward_callback_.is_null());
 }
 
 BrowsingDataRemoverImpl::SubTask::~SubTask() {}
 
 void BrowsingDataRemoverImpl::SubTask::Start() {
@@ skipping 22 matching lines @@
       is_removing_(false),
       sub_task_forward_callback_(
           base::Bind(&BrowsingDataRemoverImpl::NotifyIfDone,
                      base::Unretained(this))),
       synchronous_clear_operations_(sub_task_forward_callback_),
       clear_embedder_data_(sub_task_forward_callback_),
       clear_cache_(sub_task_forward_callback_),
       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_);
 }
 
 BrowsingDataRemoverImpl::~BrowsingDataRemoverImpl() {
   if (!task_queue_.empty()) {
     VLOG(1) << "BrowsingDataRemoverImpl shuts down with " << task_queue_.size()
             << " pending tasks";
   }
 
@@ skipping 361 matching lines @@
 }
 
 void BrowsingDataRemoverImpl::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 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;
 }
 
 const base::Time& BrowsingDataRemoverImpl::GetLastUsedBeginTime() {
   return delete_begin_;
 }
 
 const base::Time& BrowsingDataRemoverImpl::GetLastUsedEndTime() {
   return delete_end_;
 }
 
 int BrowsingDataRemoverImpl::GetLastUsedRemovalMask() {
   return remove_mask_;
 }
 
 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,
     int remove_mask,
     int origin_type_mask,
     std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
     Observer* observer)
     : delete_begin(delete_begin),
       delete_end(delete_end),
       remove_mask(remove_mask),
@@ skipping 38 matching lines @@
     // All removal tasks have finished. Inform the observers that we're idle.
     SetRemoving(false);
     return;
   }
 
   // Yield to the UI thread before executing the next removal task.
   // TODO(msramek): Consider also adding a backoff if too many tasks
   // are scheduled.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&BrowsingDataRemoverImpl::RunNextTask, GetWeakPtr()));
+      base::Bind(&BrowsingDataRemoverImpl::RunNextTask, GetImplWeakPtr()));
 }
 
 void BrowsingDataRemoverImpl::NotifyIfDone() {
   // TODO(brettw) http://crbug.com/305259: This should also observe session
   // clearing (what about other things such as passwords, etc.?) and wait for
   // them to complete before continuing.
 
   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();
 
   // Immediately bind the weak pointer to the UI thread. This makes it easier
   // to discover potential misuse on the IO thread.
   weak_ptr.get();
 
   return weak_ptr;
 }