Merge "Delete ContentHandlerFactoryTest."