Bug 931169 - waitForCondition should guard the condition evaluation. r=dkeeler

--HG--
extra : rebase_source : 13b3ba78cccf9e4f6e25ec305f2def2a59a41c74