I believe the ICE will hold a large percentage of market share for transport vehicles for at least the next 2 decades. Gasoline (spark-ignition) in general will remain common, but petroleum gasoline will be blended in increasing proportion with bio-gasoline and alcohols according to economics and regulation, and will probably change slightly in their properties from the pump gasoline of today.
The line distinguishing SI and CI engines are ever blurring, and in the near future, we will have engines that run partially in HCCI mode, but come from different design paradigms. One side will be HCCI engines based on today's SI engines (e.g. GM, Honda, VW's CGI, etc.), and the other side will be based on today's CI engines (e.g. VW's CCS, etc.). Unfortunately, there is still no agreement nor convergence of an alternative fuel standard that will run optimally on all OEMs' HCCI engines. GM is pushing E85, while VW promotes a second-gen biofuel similar to naphtha.
But emphatically, gasoline and "oil" as we know it will NOT disappear completely, only because we are now maturing the technology to make them from coal, natural gas and biomass as to be nearly indistinguishable the petroleum counterpart.