| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" | 5 #include "content/public/test/browsing_data_remover_test_util.h" |
| 6 |
| 7 namespace content { |
| 6 | 8 |
| 7 BrowsingDataRemoverCompletionObserver::BrowsingDataRemoverCompletionObserver( | 9 BrowsingDataRemoverCompletionObserver::BrowsingDataRemoverCompletionObserver( |
| 8 BrowsingDataRemover* remover) | 10 BrowsingDataRemover* remover) |
| 9 : message_loop_runner_(new content::MessageLoopRunner), observer_(this) { | 11 : message_loop_runner_(new MessageLoopRunner()), observer_(this) { |
| 10 observer_.Add(remover); | 12 observer_.Add(remover); |
| 11 } | 13 } |
| 12 | 14 |
| 13 BrowsingDataRemoverCompletionObserver:: | 15 BrowsingDataRemoverCompletionObserver:: |
| 14 ~BrowsingDataRemoverCompletionObserver() {} | 16 ~BrowsingDataRemoverCompletionObserver() {} |
| 15 | 17 |
| 16 void BrowsingDataRemoverCompletionObserver::BlockUntilCompletion() { | 18 void BrowsingDataRemoverCompletionObserver::BlockUntilCompletion() { |
| 17 message_loop_runner_->Run(); | 19 message_loop_runner_->Run(); |
| 18 } | 20 } |
| 19 | 21 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 40 void BrowsingDataRemoverCompletionInhibitor::Reset() { | 42 void BrowsingDataRemoverCompletionInhibitor::Reset() { |
| 41 if (!remover_) | 43 if (!remover_) |
| 42 return; | 44 return; |
| 43 remover_->SetWouldCompleteCallbackForTesting( | 45 remover_->SetWouldCompleteCallbackForTesting( |
| 44 base::Callback<void(const base::Closure&)>()); | 46 base::Callback<void(const base::Closure&)>()); |
| 45 remover_ = nullptr; | 47 remover_ = nullptr; |
| 46 } | 48 } |
| 47 | 49 |
| 48 void BrowsingDataRemoverCompletionInhibitor::BlockUntilNearCompletion() { | 50 void BrowsingDataRemoverCompletionInhibitor::BlockUntilNearCompletion() { |
| 49 message_loop_runner_->Run(); | 51 message_loop_runner_->Run(); |
| 50 message_loop_runner_ = new content::MessageLoopRunner; | 52 message_loop_runner_ = new MessageLoopRunner(); |
| 51 } | 53 } |
| 52 | 54 |
| 53 void BrowsingDataRemoverCompletionInhibitor::ContinueToCompletion() { | 55 void BrowsingDataRemoverCompletionInhibitor::ContinueToCompletion() { |
| 54 DCHECK(!continue_to_completion_callback_.is_null()); | 56 DCHECK(!continue_to_completion_callback_.is_null()); |
| 55 continue_to_completion_callback_.Run(); | 57 continue_to_completion_callback_.Run(); |
| 56 continue_to_completion_callback_.Reset(); | 58 continue_to_completion_callback_.Reset(); |
| 57 } | 59 } |
| 58 | 60 |
| 59 void BrowsingDataRemoverCompletionInhibitor::OnBrowsingDataRemoverWouldComplete( | 61 void BrowsingDataRemoverCompletionInhibitor::OnBrowsingDataRemoverWouldComplete( |
| 60 const base::Closure& continue_to_completion) { | 62 const base::Closure& continue_to_completion) { |
| 61 DCHECK(continue_to_completion_callback_.is_null()); | 63 DCHECK(continue_to_completion_callback_.is_null()); |
| 62 continue_to_completion_callback_ = continue_to_completion; | 64 continue_to_completion_callback_ = continue_to_completion; |
| 63 message_loop_runner_->Quit(); | 65 message_loop_runner_->Quit(); |
| 64 } | 66 } |
| 67 |
| 68 } // namespace content |
| OLD | NEW |