I’m dubious that tipping is going away, based on my experience living in Portland. Waiters in Portland make a minimum wage of $15.45/hr, tips cannot be used as “credit” to this wage (illegal in Oregon). You’ll still get stink-eye for tipping less than 25%, and that’s at a restaurant where you order at the counter, and bus your own table.