I wrote off Flickr a long time ago and didn't even consider them for this comparison. My mistake.

Does Yahoo run Flickr on its own infrastructure, or rent it like Dropbox and Apple? If the former... why isn't Yahoo a major player in this market? Giving away a terabyte is great, but you would think that it signals a move by Yahoo to build out their infrastructure.