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 "content/shell/test_runner/test_runner.h" | 5 #include "content/shell/test_runner/test_runner.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <limits> | 8 #include <limits> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
633 .SetProperty("webHistoryItemCount", | 633 .SetProperty("webHistoryItemCount", |
634 &TestRunnerBindings::WebHistoryItemCount) | 634 &TestRunnerBindings::WebHistoryItemCount) |
635 .SetMethod("windowCount", &TestRunnerBindings::WindowCount); | 635 .SetMethod("windowCount", &TestRunnerBindings::WindowCount); |
636 } | 636 } |
637 | 637 |
638 void TestRunnerBindings::LogToStderr(const std::string& output) { | 638 void TestRunnerBindings::LogToStderr(const std::string& output) { |
639 LOG(ERROR) << output; | 639 LOG(ERROR) << output; |
640 } | 640 } |
641 | 641 |
642 void TestRunnerBindings::NotifyDone() { | 642 void TestRunnerBindings::NotifyDone() { |
643 LOG(ERROR) << "Notifying done"; | |
Nate Chapin
2017/03/07 18:39:08
?
clamy
2017/03/14 16:40:20
Sorry, leftover from debugging. Removed.
| |
643 if (runner_) | 644 if (runner_) |
644 runner_->NotifyDone(); | 645 runner_->NotifyDone(); |
645 } | 646 } |
646 | 647 |
647 void TestRunnerBindings::WaitUntilDone() { | 648 void TestRunnerBindings::WaitUntilDone() { |
648 if (runner_) | 649 if (runner_) |
649 runner_->WaitUntilDone(); | 650 runner_->WaitUntilDone(); |
650 } | 651 } |
651 | 652 |
652 void TestRunnerBindings::QueueBackNavigation(int how_far_back) { | 653 void TestRunnerBindings::QueueBackNavigation(int how_far_back) { |
(...skipping 2186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2839 | 2840 |
2840 void TestRunner::NotifyDone() { | 2841 void TestRunner::NotifyDone() { |
2841 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && | 2842 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && |
2842 !will_navigate_ && work_queue_.is_empty()) | 2843 !will_navigate_ && work_queue_.is_empty()) |
2843 delegate_->TestFinished(); | 2844 delegate_->TestFinished(); |
2844 layout_test_runtime_flags_.set_wait_until_done(false); | 2845 layout_test_runtime_flags_.set_wait_until_done(false); |
2845 OnLayoutTestRuntimeFlagsChanged(); | 2846 OnLayoutTestRuntimeFlagsChanged(); |
2846 } | 2847 } |
2847 | 2848 |
2848 } // namespace test_runner | 2849 } // namespace test_runner |
OLD | NEW |