As Canada girds for a trade war with U.S. President Donald Trump, Premier Doug Ford has retooled his cabinet to try to make Ontario's economy more competitive and diverse.