Dont think Canon wont upgrade the 7D. Way to many have a need for a pro level 1.6 crop.
Their problem lies in what to do about the other crop bodies. As it is now the xxxD, and xxD lines are to similar. From a manufacturing perspective it is getting to costly to keep this many models, with so few differences on the table. Same thing is happening with the lenses too.
The xxxD/xxD lines will probably be merged together, and give a clear position for the 7D replacement, to sit in the line-up. The price is gonna be kinda steep, around 3K.
I think in a few years the number of products that Canon offers for still photography will be smaller than whats out there today.
Likewise on glass, the zoom offerings will be scaled back. Remember, Canon has to make a profit to stay in business.