...than 25313923 "Fix CppunitTest_services for
constructor-based implementations..." (which this commit reverts again).  My
claim that "the 'factory' would be the object itself" is nonsense, it would
rather be an ImplementationWrapper (but one that was freshly created for each
ServiceManager::createContentEnumeration).

Change-Id: I85c683cff6f9ba78d0f8567a53f8fcbc56fe55cf