diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 07:27:27 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 07:27:27 +0000 |
| commit | 5c34e39cea9e91fda04224aa7f5cb490fd5fb0c4 (patch) | |
| tree | b30014e7c4d4f4be968ee4fa358948c0aa8739e1 /chrome/test/ui_test_utils.cc | |
| parent | 12ea22a1337a63db017338156ba56abd62beacbd (diff) | |
| download | chromium_src-5c34e39cea9e91fda04224aa7f5cb490fd5fb0c4.zip chromium_src-5c34e39cea9e91fda04224aa7f5cb490fd5fb0c4.tar.gz chromium_src-5c34e39cea9e91fda04224aa7f5cb490fd5fb0c4.tar.bz2 | |
Move use_host_network test out of ChromeFrame.
Some refactoring of ExternalTabUITestMockClient.
TEST=ui_tests
Review URL: http://codereview.chromium.org/384058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 8da3db3..6723084 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -505,7 +505,8 @@ void RegisterAndWait(NotificationType::Type type, TimedMessageLoopRunner::TimedMessageLoopRunner() : loop_(new MessageLoopForUI()), - owned_(true) { + owned_(true), + quit_loop_invoked_(false) { } TimedMessageLoopRunner::~TimedMessageLoopRunner() { @@ -515,14 +516,17 @@ TimedMessageLoopRunner::~TimedMessageLoopRunner() { void TimedMessageLoopRunner::RunFor(int ms) { QuitAfter(ms); + quit_loop_invoked_ = false; loop_->Run(); } void TimedMessageLoopRunner::Quit() { + quit_loop_invoked_ = true; loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask); } void TimedMessageLoopRunner::QuitAfter(int ms) { + quit_loop_invoked_ = true; loop_->PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, ms); } |