Bug 888381: NPE on closeOptionsMenu() in BrowerToolbar. [r=mfinkle]

--HG--
extra : rebase_source : f779107a2893ae2d40113bc67f461adc0fa6767b