Simplification and generalization of UriRequest.

Change-Id: I2fd6c6c84489d0b86d91c674fba86fb069d33de9