Merge "Update WebHistoryItemTest to be more deterministic."