Bug 1296295 - Followup bug 1295920, replace enum with enum class r=jya