| Index: chrome/browser/browsing_data/browsing_data_remover_test_util.h
|
| diff --git a/chrome/browser/browsing_data/browsing_data_remover_test_util.h b/chrome/browser/browsing_data/browsing_data_remover_test_util.h
|
| index c0c7dd4df3f5d5440c3969bea468985b7db3315a..9a202be34c578cc84f884c2b2295f169cccd9507 100644
|
| --- a/chrome/browser/browsing_data/browsing_data_remover_test_util.h
|
| +++ b/chrome/browser/browsing_data/browsing_data_remover_test_util.h
|
| @@ -9,7 +9,6 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/scoped_observer.h"
|
| #include "chrome/browser/browsing_data/browsing_data_remover.h"
|
| -#include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
|
| #include "content/public/test/test_utils.h"
|
|
|
| // This class can be used to wait for a BrowsingDataRemover to complete
|
| @@ -33,22 +32,21 @@ class BrowsingDataRemoverCompletionObserver
|
| DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverCompletionObserver);
|
| };
|
|
|
| -class BrowsingDataRemoverCompletionInhibitor
|
| - : public BrowsingDataRemoverImpl::CompletionInhibitor {
|
| +class BrowsingDataRemoverCompletionInhibitor {
|
| public:
|
| - BrowsingDataRemoverCompletionInhibitor();
|
| - ~BrowsingDataRemoverCompletionInhibitor() override;
|
| + explicit BrowsingDataRemoverCompletionInhibitor(BrowsingDataRemover* remover);
|
| + virtual ~BrowsingDataRemoverCompletionInhibitor();
|
|
|
| void BlockUntilNearCompletion();
|
| void ContinueToCompletion();
|
|
|
| protected:
|
| - // BrowsingDataRemoverImpl::CompletionInhibitor:
|
| - void OnBrowsingDataRemoverWouldComplete(
|
| - BrowsingDataRemoverImpl* remover,
|
| - const base::Closure& continue_to_completion) override;
|
| + virtual void OnBrowsingDataRemoverWouldComplete(
|
| + const base::Closure& continue_to_completion);
|
|
|
| private:
|
| + base::WeakPtr<BrowsingDataRemover> remover_;
|
| +
|
| scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
|
| base::Closure continue_to_completion_callback_;
|
|
|
|
|