Also, for what it's worth, I believe it's the law in AZ that food establishments must offer free water to anyone who comes in and asks for it.
Slightly off-topic: I see plenty of people go out to fast food and much nicer restaurants, and they always order only water to drink. Personally, I think that's taking advantage of a business, so I always order something like iced tea, or lemonade, or a beer, etc. It's been touted here and at plenty of other frugal-type sites that if you and all of your dining companions just order water that that is a smart thing to do. Well, yes, it's cheaper, but it's a restaurant not a public park bench.
Drinks are profitable and if you want to see them stay in business, order something to drink besides water.

Finally, agree with others that it's never right to harass a service worker for something their CEO/Bd of Directors said or did. At the same time, it's everyone's right to decline to patronize establishments that are actively participating in discrimination, directly or indirectly.