The company was actually Yahoo HongKong (the server is said to be hosted in the US). The order was sent by Department of National Security, through a representative of Yahoo in Beijing. There is no evidence indicating that Yahoo had ever fight for this.
Also the message leaked by Shi was just a guideline sent by the Department of Propaganda to all the newspapers/media companies. It is nothing similar to the Manning case.