8031330: Refactor ObjectFactory

Reviewed-by: alanb, lancea, dfuchs, skoivu
2 files changed