Land isn't going to be a constraint in most countries. Solar resources, while distributed unevenly, are significantly more evenly distributed than fossil or nuclear fuels, or even wind resources. See for example this map of insolation in the US: http://www.nrel.gov/gis/images/solar/national_photovoltaic_2...
In the continental US the very best solar resources are maybe ~7 kWh/m^2/day and there's hardly anything below 3.5. Or to put it in terms of cities, Seattle gets 58% as much annual insolation as sun-drenched Phoenix: http://www.i4at.org/lib2/solarrad.htm
So it took many historical performance:price doublings before unsubsidized solar electricity got within shouting distance of fossil electricity in even the sunniest places in the US, and then just one more to reach that threshold across most of the country.
The technical and economic performance of wind/PV has already improved enough, and has enough assured near-future improvements already in the pipeline, that I'd say it would be destined to "eat the world" for electricity if storage were a solved problem. But storage isn't a solved problem.
Most discoveries that get hyped as "battery breakthrough" by university press offices aren't really breakthroughs, but there's so much research that there's an abundance of riches even after you throw away the ~95% that looks bad on slightly closer examination. Common problems with battery "breakthroughs" that justify quick rejection: dependence on rare elements (lithium is reasonably abundant; I mean things like tellurium, germanium, rhenium...), low cycle life, effects demonstrated only at interfaces or in nanostructures without any obvious path to bulk scaling. Among the remaining ~5% that looks interesting, assuming the publications aren't fraudulent, I have little idea which ones will end up industrially significant. Chemistry is a lot easier to model than market success. There are also partial substitutions for electricity storage that could displace and/or complement it: supergrids, demand response, thermal buffering...