China is taking measures to ensure the anniversary of the Tiananmen Square massacre passes without incident, while attempting to increase the role of markets in its economy.