Bug 1040864 - [Camera] Fix unit test after bad merge on bug 1024384 upli...

...ft to v2.0