They'll do what makes their shareholders richer. They'll keep helping surveillance unless doing so hits them where it hurts - money. If the general public valued privacy more than convenience, they'd start avoiding services and products from these companies. I wouldn't bet on that.