Bug 1072174 - Handle all the cases XrayWrapper.cpp. r=peterv, a=2.0+