https://en.wikipedia.org/wiki/Criticism_of_Google#China has a short summary. You're correct that since 2010 they've refused to assist with government censorship; I had been thinking of what came before that. I think you have a good point that today, Google is the better actor in China.
What did Google do in China? I remember them pulling out of China, declining to participate further in censorship there, and being attacked (hacked) by the Chinese government. What am I forgetting?