Bug 820835 - wrap social implementation in a function scope to prevent 'namespace pollution'.  r=jaws
Bug 852117: Back out 794d86e866c3 due to big jump in mallocs r=me

--HG--
extra : rebase_source : d084a5d7a2f7675a1f53fc91cb87f486797c79f8