diff options
| author | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 20:33:55 +0000 |
|---|---|---|
| committer | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 20:33:55 +0000 |
| commit | c3ca97b0428eaa9ec956823e1e8c0ca2d2fd4e48 (patch) | |
| tree | 92cc0ac31519a6f7a3a63e7853956931364e68f5 /remoting/test/waiter.cc | |
| parent | 198bd20b0a8644ce4d4ef700bc2413fac3606842 (diff) | |
| download | chromium_src-c3ca97b0428eaa9ec956823e1e8c0ca2d2fd4e48.zip chromium_src-c3ca97b0428eaa9ec956823e1e8c0ca2d2fd4e48.tar.gz chromium_src-c3ca97b0428eaa9ec956823e1e8c0ca2d2fd4e48.tar.bz2 | |
Enable the remoting browser_tests to interact with multiple browser windows and
remove the workaround introduced for 291207.
The chromoting browser tests deal with multiple browser windows by keeping track of and always interacting with the "active" browser window. An observer is added in Authorize() to monitor browser window creation so that the active window can be switched at the right time.
I also fixed a but in ConditionTimeoutWaiter and adjusted the timeout values in various test routines.
BUG=294343
Review URL: https://codereview.chromium.org/24666002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/test/waiter.cc')
| -rw-r--r-- | remoting/test/waiter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/test/waiter.cc b/remoting/test/waiter.cc index adc21c0..ccc2920 100644 --- a/remoting/test/waiter.cc +++ b/remoting/test/waiter.cc @@ -73,8 +73,8 @@ void ConditionalTimeoutWaiter::CancelWait() { void ConditionalTimeoutWaiter::CancelWaitCallback() { if (callback_.Run()) { - CancelWait(); success_ = true; + CancelWait(); } } |