Son-in-law acting as a wali for a lady during hajj and umrah

Son -in-law can be a 'wali' for the mother in law. Not a adopted son. In the case of the 'adopted son' as stated by you some Ulema state that there is some room for permissability, provided there exists absolutely no passionate inclination between that particular "adopted son" with the 'mother'.