Backed out changeset 2504e03f6eec (bug 952102) for landing with the wrong bug number.
Bug 952102 - Fix VideoConduit unit tests. r=jesup
DONTBUILD