content/test/test_navigation_observer.cc - Issue 10479018: Add base::RunLoop and update ui_test_utils to use it to reduce flakiness

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/test/test_navigation_observer.cc

Issue 10479018: Add base::RunLoop and update ui_test_utils to use it to reduce flakiness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more test fixes Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/test/base/ui_test_utils.h ('K') | « chrome/test/perf/rendering/throughput_tests.cc ('k') | ui/ui_controls/ui_controls_internal_win.cc » ('j') | ui/ui_controls/ui_controls_internal_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/test_navigation_observer.cc

diff --git a/content/test/test_navigation_observer.cc b/content/test/test_navigation_observer.cc

index 89ff36fd575feb8ec98c98463596d8c7442c5a2e..50400c41350e4401cce0d37762bc50fa41aa1ed1 100644

--- a/content/test/test_navigation_observer.cc

+++ b/content/test/test_navigation_observer.cc

@@ -87,8 +87,7 @@ void TestNavigationObserver::Wait() {

WaitForObservation(

base::Bind(&MessageLoop::Run,

base::Unretained(MessageLoop::current())),

- base::Bind(&MessageLoop::Quit,

- base::Unretained(MessageLoop::current())));

+ MessageLoop::QuitAfterPendingClosure());

}

TestNavigationObserver::TestNavigationObserver(

@@ -131,8 +130,10 @@ void TestNavigationObserver::Observe(

++navigations_completed_ == number_of_navigations_) {

navigation_started_ = false;

done_ = true;

- if (running_)

+ if (running_) {

+ running_ = false;

done_callback_.Run();

+ }

}

break;

case NOTIFICATION_RENDER_VIEW_HOST_CREATED: