Recommit "Use unique_ptr to manager FilterChooser ownership."

Just using insert of a pair this time instead of emplace.