Yes, both of those are okay and both have the same meaning. I think most native speakers would use the first one (I went on a tour of Tokyo) unless they followed the second one (I toured Tokyo) with more information. Otherwise, the second one just feels very short and abrupt.
I hope that helps. :)