Jason Duell 386a098a89 Merge from m-c. ... Fair amount of merge conflicts. Biggest item was changes to nsHttpChannel from web sockets changes. Other likely suspects if things are borken: nsFrameLoader.cpp: - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or nsnull (m-c) to local process call to new nsFrameMessageManager(), callback arg? Smaug said null. - only calling SetCallBackData for local case. also +r smaug. nsPrefBranch.cpp had fairly extensive merge conflicts. nsChromeRegistry had lots of changes. Dougt did most of the non-necko changes (thanks). --HG-- rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h		2010-06-22 17:33:57 -07:00
..
crashtests	Add a bunch of crashtests	2010-06-08 17:53:08 -07:00
mochitest	Test for bug 509244	2009-11-02 16:35:20 +13:00
public	Merge from m-c.	2010-06-22 17:33:57 -07:00
src	Merge from m-c.	2010-06-22 17:33:57 -07:00
test	Bug 534136 Part 2: Use 16bit-char buffers inside atoms. r=bz sr=mrbkap	2010-03-08 07:45:00 -08:00
Makefile.in	Fix the one mochitest that's exported to _tests in a disable-tests build. (Bug 515993) r=ted	2009-09-16 12:01:18 -07:00