Bug 691411 - Move js/src/xpconnect to js/xpconnect and rename source files while we're at it. r=khuey, sr=mrbkap
authorBobby Holley <bobbyholley@gmail.com>
Fri, 14 Oct 2011 10:52:47 -0700
changeset 79380 51541b56d20d588edc5a6111d670ca5af3db39d5
parent 79379 80d7e83b765985cae8aeff60b47b311d0422bbe1
child 79381 014c9cf5088f1af09d9d3969771c9ef857b3dd78
push idunknown
push userunknown
push dateunknown
reviewerskhuey, mrbkap
bugs691411
milestone10.0a1
Bug 691411 - Move js/src/xpconnect to js/xpconnect and rename source files while we're at it. r=khuey, sr=mrbkap
caps/src/Makefile.in
content/base/src/Makefile.in
content/base/src/nsDOMFileReader.cpp
content/html/content/src/Makefile.in
content/xbl/src/Makefile.in
docshell/base/Makefile.in
dom/base/Makefile.in
dom/indexedDB/Makefile.in
dom/workers/File.cpp
dom/workers/Makefile.in
ipc/testshell/Makefile.in
js/src/xpconnect/Makefile.in
js/src/xpconnect/crashtests/117307-1.html
js/src/xpconnect/crashtests/193710.html
js/src/xpconnect/crashtests/290162-1.html
js/src/xpconnect/crashtests/326615-1.html
js/src/xpconnect/crashtests/328553-1.html
js/src/xpconnect/crashtests/346258-1.html
js/src/xpconnect/crashtests/346512-1-frame1.xhtml
js/src/xpconnect/crashtests/346512-1-frame2.xhtml
js/src/xpconnect/crashtests/346512-1.xhtml
js/src/xpconnect/crashtests/382133-1.html
js/src/xpconnect/crashtests/386680-1.html
js/src/xpconnect/crashtests/394810-1.html
js/src/xpconnect/crashtests/400349-1.html
js/src/xpconnect/crashtests/403356-1.html
js/src/xpconnect/crashtests/418139-1.svg
js/src/xpconnect/crashtests/420513-1.html
js/src/xpconnect/crashtests/453935-1.html
js/src/xpconnect/crashtests/462926.html
js/src/xpconnect/crashtests/467693-1.html
js/src/xpconnect/crashtests/468552-1.html
js/src/xpconnect/crashtests/471366-1.html
js/src/xpconnect/crashtests/475185-1.html
js/src/xpconnect/crashtests/475291-1.html
js/src/xpconnect/crashtests/503286-1.html
js/src/xpconnect/crashtests/504000-1.html
js/src/xpconnect/crashtests/509075-1.html
js/src/xpconnect/crashtests/512815-1.html
js/src/xpconnect/crashtests/515726-1.html
js/src/xpconnect/crashtests/545291-1.html
js/src/xpconnect/crashtests/558979.html
js/src/xpconnect/crashtests/582649.html
js/src/xpconnect/crashtests/601284-1.html
js/src/xpconnect/crashtests/603146-1.html
js/src/xpconnect/crashtests/603858-1.html
js/src/xpconnect/crashtests/608963.html
js/src/xpconnect/crashtests/616930-1.html
js/src/xpconnect/crashtests/639737-1.html
js/src/xpconnect/crashtests/648206-1.html
js/src/xpconnect/crashtests/crashtests.list
js/src/xpconnect/idl/Makefile.in
js/src/xpconnect/idl/mozIJSSubScriptLoader.idl
js/src/xpconnect/idl/nsIJSContextStack.idl
js/src/xpconnect/idl/nsIJSEngineTelemetryStats.idl
js/src/xpconnect/idl/nsIJSRuntimeService.idl
js/src/xpconnect/idl/nsIScriptError.idl
js/src/xpconnect/idl/nsIXPCScriptNotify.idl
js/src/xpconnect/idl/nsIXPCScriptable.idl
js/src/xpconnect/idl/nsIXPCSecurityManager.idl
js/src/xpconnect/idl/nsIXPConnect.idl
js/src/xpconnect/idl/xpcIJSGetFactory.idl
js/src/xpconnect/idl/xpcIJSModuleLoader.idl
js/src/xpconnect/idl/xpcIJSWeakReference.idl
js/src/xpconnect/idl/xpccomponents.idl
js/src/xpconnect/idl/xpcexception.idl
js/src/xpconnect/idl/xpcjsid.idl
js/src/xpconnect/loader/Makefile.in
js/src/xpconnect/loader/XPCOMUtils.jsm
js/src/xpconnect/loader/mozJSComponentLoader.cpp
js/src/xpconnect/loader/mozJSComponentLoader.h
js/src/xpconnect/loader/mozJSLoaderUtils.cpp
js/src/xpconnect/loader/mozJSLoaderUtils.h
js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
js/src/xpconnect/loader/mozJSSubScriptLoader.h
js/src/xpconnect/public/Makefile.in
js/src/xpconnect/public/nsAXPCNativeCallContext.h
js/src/xpconnect/public/nsAutoJSValHolder.h
js/src/xpconnect/public/xpc_map_end.h
js/src/xpconnect/shell/Makefile.in
js/src/xpconnect/shell/jsshell.msg
js/src/xpconnect/shell/xpcshell.cpp
js/src/xpconnect/shell/xpcshellMacUtils.h
js/src/xpconnect/shell/xpcshellMacUtils.mm
js/src/xpconnect/src/Makefile.in
js/src/xpconnect/src/README
js/src/xpconnect/src/XPCWrapper.cpp
js/src/xpconnect/src/XPCWrapper.h
js/src/xpconnect/src/codegen.py
js/src/xpconnect/src/dom_quickstubs.qsconf
js/src/xpconnect/src/dombindings.conf
js/src/xpconnect/src/dombindings.cpp
js/src/xpconnect/src/dombindings.h
js/src/xpconnect/src/dombindingsgen.py
js/src/xpconnect/src/nsCSSPropertiesQS.h
js/src/xpconnect/src/nsDOMQS.h
js/src/xpconnect/src/nsScriptError.cpp
js/src/xpconnect/src/nsXPConnect.cpp
js/src/xpconnect/src/qsWinUndefs.h
js/src/xpconnect/src/qsgen.py
js/src/xpconnect/src/xpc.msg
js/src/xpconnect/src/xpcJSWeakReference.cpp
js/src/xpconnect/src/xpcJSWeakReference.h
js/src/xpconnect/src/xpccallcontext.cpp
js/src/xpconnect/src/xpccomponents.cpp
js/src/xpconnect/src/xpccontext.cpp
js/src/xpconnect/src/xpcconvert.cpp
js/src/xpconnect/src/xpcdebug.cpp
js/src/xpconnect/src/xpcexception.cpp
js/src/xpconnect/src/xpcforwards.h
js/src/xpconnect/src/xpcinlines.h
js/src/xpconnect/src/xpcjsid.cpp
js/src/xpconnect/src/xpcjsruntime.cpp
js/src/xpconnect/src/xpclocale.cpp
js/src/xpconnect/src/xpclog.cpp
js/src/xpconnect/src/xpclog.h
js/src/xpconnect/src/xpcmaps.cpp
js/src/xpconnect/src/xpcmaps.h
js/src/xpconnect/src/xpcmodule.cpp
js/src/xpconnect/src/xpcmodule.h
js/src/xpconnect/src/xpcprivate.h
js/src/xpconnect/src/xpcpublic.h
js/src/xpconnect/src/xpcquickstubs.cpp
js/src/xpconnect/src/xpcquickstubs.h
js/src/xpconnect/src/xpcruntimesvc.cpp
js/src/xpconnect/src/xpcstack.cpp
js/src/xpconnect/src/xpcstring.cpp
js/src/xpconnect/src/xpcthreadcontext.cpp
js/src/xpconnect/src/xpcthrower.cpp
js/src/xpconnect/src/xpcvariant.cpp
js/src/xpconnect/src/xpcwrappedjs.cpp
js/src/xpconnect/src/xpcwrappedjsclass.cpp
js/src/xpconnect/src/xpcwrappednative.cpp
js/src/xpconnect/src/xpcwrappednativeinfo.cpp
js/src/xpconnect/src/xpcwrappednativejsops.cpp
js/src/xpconnect/src/xpcwrappednativeproto.cpp
js/src/xpconnect/src/xpcwrappednativescope.cpp
js/src/xpconnect/tests/Makefile.in
js/src/xpconnect/tests/chrome/Makefile.in
js/src/xpconnect/tests/chrome/bug503926.xul
js/src/xpconnect/tests/chrome/file_bug618176.xul
js/src/xpconnect/tests/chrome/file_evalInSandbox.html
js/src/xpconnect/tests/chrome/test_APIExposer.xul
js/src/xpconnect/tests/chrome/test_bug448587.xul
js/src/xpconnect/tests/chrome/test_bug484459.xul
js/src/xpconnect/tests/chrome/test_bug500931.xul
js/src/xpconnect/tests/chrome/test_bug503926.xul
js/src/xpconnect/tests/chrome/test_bug517163.xul
js/src/xpconnect/tests/chrome/test_bug533596.xul
js/src/xpconnect/tests/chrome/test_bug571849.xul
js/src/xpconnect/tests/chrome/test_bug596580.xul
js/src/xpconnect/tests/chrome/test_bug601803.xul
js/src/xpconnect/tests/chrome/test_bug610390.xul
js/src/xpconnect/tests/chrome/test_bug614757.xul
js/src/xpconnect/tests/chrome/test_bug616992.xul
js/src/xpconnect/tests/chrome/test_bug618176.xul
js/src/xpconnect/tests/chrome/test_bug654370.xul
js/src/xpconnect/tests/chrome/test_bug658560.xul
js/src/xpconnect/tests/chrome/test_bug664689.xul
js/src/xpconnect/tests/chrome/test_bug679861.xul
js/src/xpconnect/tests/chrome/test_cows.xul
js/src/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
js/src/xpconnect/tests/chrome/test_evalInSandbox.xul
js/src/xpconnect/tests/chrome/test_getweakmapkeys.xul
js/src/xpconnect/tests/chrome/test_nodelists.xul
js/src/xpconnect/tests/chrome/test_precisegc.xul
js/src/xpconnect/tests/chrome/test_sandboxImport.xul
js/src/xpconnect/tests/chrome/test_wrappers-2.xul
js/src/xpconnect/tests/chrome/test_wrappers.xul
js/src/xpconnect/tests/components/js/Makefile.in
js/src/xpconnect/tests/components/js/xpctest.manifest
js/src/xpconnect/tests/components/js/xpctest_attributes.js
js/src/xpconnect/tests/components/js/xpctest_params.js
js/src/xpconnect/tests/components/native/Makefile.in
js/src/xpconnect/tests/components/native/xpctest.manifest
js/src/xpconnect/tests/components/native/xpctest_attributes.cpp
js/src/xpconnect/tests/components/native/xpctest_module.cpp
js/src/xpconnect/tests/components/native/xpctest_params.cpp
js/src/xpconnect/tests/components/native/xpctest_private.h
js/src/xpconnect/tests/idl/Makefile.in
js/src/xpconnect/tests/idl/xpctest_attributes.idl
js/src/xpconnect/tests/idl/xpctest_params.idl
js/src/xpconnect/tests/mochitest/Makefile.in
js/src/xpconnect/tests/mochitest/bug500931_helper.html
js/src/xpconnect/tests/mochitest/bug504877_helper.html
js/src/xpconnect/tests/mochitest/bug571849_helper.html
js/src/xpconnect/tests/mochitest/bug589028_helper.html
js/src/xpconnect/tests/mochitest/bug657267.jar
js/src/xpconnect/tests/mochitest/bug92773_helper.html
js/src/xpconnect/tests/mochitest/chrome_wrappers_helper.html
js/src/xpconnect/tests/mochitest/file1_bug629227.html
js/src/xpconnect/tests/mochitest/file2_bug629227.html
js/src/xpconnect/tests/mochitest/file_bug505915.html
js/src/xpconnect/tests/mochitest/file_bug650273.html
js/src/xpconnect/tests/mochitest/file_bug658560.html
js/src/xpconnect/tests/mochitest/file_doublewrappedcompartments.html
js/src/xpconnect/tests/mochitest/file_evalInSandbox.html
js/src/xpconnect/tests/mochitest/file_nodelists.html
js/src/xpconnect/tests/mochitest/file_wrappers-2.html
js/src/xpconnect/tests/mochitest/inner.html
js/src/xpconnect/tests/mochitest/test1_bug629331.html
js/src/xpconnect/tests/mochitest/test2_bug629331.html
js/src/xpconnect/tests/mochitest/test_bug361111.xul
js/src/xpconnect/tests/mochitest/test_bug384632.html
js/src/xpconnect/tests/mochitest/test_bug390488.html
js/src/xpconnect/tests/mochitest/test_bug393269.html
js/src/xpconnect/tests/mochitest/test_bug396851.html
js/src/xpconnect/tests/mochitest/test_bug428021.html
js/src/xpconnect/tests/mochitest/test_bug446584.html
js/src/xpconnect/tests/mochitest/test_bug462428.html
js/src/xpconnect/tests/mochitest/test_bug478438.html
js/src/xpconnect/tests/mochitest/test_bug484107.html
js/src/xpconnect/tests/mochitest/test_bug500691.html
js/src/xpconnect/tests/mochitest/test_bug502959.html
js/src/xpconnect/tests/mochitest/test_bug503926.html
js/src/xpconnect/tests/mochitest/test_bug504877.html
js/src/xpconnect/tests/mochitest/test_bug505915.html
js/src/xpconnect/tests/mochitest/test_bug553407.html
js/src/xpconnect/tests/mochitest/test_bug560351.html
js/src/xpconnect/tests/mochitest/test_bug564330.html
js/src/xpconnect/tests/mochitest/test_bug585745.html
js/src/xpconnect/tests/mochitest/test_bug589028.html
js/src/xpconnect/tests/mochitest/test_bug601299.html
js/src/xpconnect/tests/mochitest/test_bug605167.html
js/src/xpconnect/tests/mochitest/test_bug618017.html
js/src/xpconnect/tests/mochitest/test_bug623437.html
js/src/xpconnect/tests/mochitest/test_bug628410.html
js/src/xpconnect/tests/mochitest/test_bug628794.html
js/src/xpconnect/tests/mochitest/test_bug629227.html
js/src/xpconnect/tests/mochitest/test_bug629331.html
js/src/xpconnect/tests/mochitest/test_bug636097.html
js/src/xpconnect/tests/mochitest/test_bug650273.html
js/src/xpconnect/tests/mochitest/test_bug655297.html
js/src/xpconnect/tests/mochitest/test_bug657267.html
js/src/xpconnect/tests/mochitest/test_bug661980.html
js/src/xpconnect/tests/mochitest/test_bug691059.html
js/src/xpconnect/tests/mochitest/test_bug92773.html
js/src/xpconnect/tests/mochitest/test_frameWrapping.html
js/src/xpconnect/tests/unit/CatRegistrationComponents.manifest
js/src/xpconnect/tests/unit/bogus_element_type.jsm
js/src/xpconnect/tests/unit/bogus_exports_type.jsm
js/src/xpconnect/tests/unit/bug451678_subscript.js
js/src/xpconnect/tests/unit/bug596580_versioned.js
js/src/xpconnect/tests/unit/component-file.js
js/src/xpconnect/tests/unit/component-file.manifest
js/src/xpconnect/tests/unit/component_import.js
js/src/xpconnect/tests/unit/component_import.manifest
js/src/xpconnect/tests/unit/recursive_importA.jsm
js/src/xpconnect/tests/unit/recursive_importB.jsm
js/src/xpconnect/tests/unit/syntax_error.jsm
js/src/xpconnect/tests/unit/test_attributes.js
js/src/xpconnect/tests/unit/test_bogus_files.js
js/src/xpconnect/tests/unit/test_bug408412.js
js/src/xpconnect/tests/unit/test_bug451678.js
js/src/xpconnect/tests/unit/test_bug596580.js
js/src/xpconnect/tests/unit/test_bug604362.js
js/src/xpconnect/tests/unit/test_bug608142.js
js/src/xpconnect/tests/unit/test_bug641378.js
js/src/xpconnect/tests/unit/test_bug677864.js
js/src/xpconnect/tests/unit/test_bug_442086.js
js/src/xpconnect/tests/unit/test_file.js
js/src/xpconnect/tests/unit/test_import.js
js/src/xpconnect/tests/unit/test_js_weak_references.js
js/src/xpconnect/tests/unit/test_localeCompare.js
js/src/xpconnect/tests/unit/test_params.js
js/src/xpconnect/tests/unit/test_recursive_import.js
js/src/xpconnect/tests/unit/test_reflect_parse.js
js/src/xpconnect/tests/unit/test_unload.js
js/src/xpconnect/tests/unit/test_xpcomutils.js
js/src/xpconnect/tests/unit/xpcshell.ini
js/src/xpconnect/wrappers/AccessCheck.cpp
js/src/xpconnect/wrappers/AccessCheck.h
js/src/xpconnect/wrappers/CrossOriginWrapper.cpp
js/src/xpconnect/wrappers/CrossOriginWrapper.h
js/src/xpconnect/wrappers/FilteringWrapper.cpp
js/src/xpconnect/wrappers/FilteringWrapper.h
js/src/xpconnect/wrappers/Makefile.in
js/src/xpconnect/wrappers/WrapperFactory.cpp
js/src/xpconnect/wrappers/WrapperFactory.h
js/src/xpconnect/wrappers/XrayWrapper.cpp
js/src/xpconnect/wrappers/XrayWrapper.h
js/xpconnect/Makefile.in
js/xpconnect/crashtests/117307-1.html
js/xpconnect/crashtests/193710.html
js/xpconnect/crashtests/290162-1.html
js/xpconnect/crashtests/326615-1.html
js/xpconnect/crashtests/328553-1.html
js/xpconnect/crashtests/346258-1.html
js/xpconnect/crashtests/346512-1-frame1.xhtml
js/xpconnect/crashtests/346512-1-frame2.xhtml
js/xpconnect/crashtests/346512-1.xhtml
js/xpconnect/crashtests/382133-1.html
js/xpconnect/crashtests/386680-1.html
js/xpconnect/crashtests/394810-1.html
js/xpconnect/crashtests/400349-1.html
js/xpconnect/crashtests/403356-1.html
js/xpconnect/crashtests/418139-1.svg
js/xpconnect/crashtests/420513-1.html
js/xpconnect/crashtests/453935-1.html
js/xpconnect/crashtests/462926.html
js/xpconnect/crashtests/467693-1.html
js/xpconnect/crashtests/468552-1.html
js/xpconnect/crashtests/471366-1.html
js/xpconnect/crashtests/475185-1.html
js/xpconnect/crashtests/475291-1.html
js/xpconnect/crashtests/503286-1.html
js/xpconnect/crashtests/504000-1.html
js/xpconnect/crashtests/509075-1.html
js/xpconnect/crashtests/512815-1.html
js/xpconnect/crashtests/515726-1.html
js/xpconnect/crashtests/545291-1.html
js/xpconnect/crashtests/558979.html
js/xpconnect/crashtests/582649.html
js/xpconnect/crashtests/601284-1.html
js/xpconnect/crashtests/603146-1.html
js/xpconnect/crashtests/603858-1.html
js/xpconnect/crashtests/608963.html
js/xpconnect/crashtests/616930-1.html
js/xpconnect/crashtests/639737-1.html
js/xpconnect/crashtests/648206-1.html
js/xpconnect/crashtests/crashtests.list
js/xpconnect/idl/Makefile.in
js/xpconnect/idl/mozIJSSubScriptLoader.idl
js/xpconnect/idl/nsIJSContextStack.idl
js/xpconnect/idl/nsIJSEngineTelemetryStats.idl
js/xpconnect/idl/nsIJSRuntimeService.idl
js/xpconnect/idl/nsIScriptError.idl
js/xpconnect/idl/nsIXPCScriptNotify.idl
js/xpconnect/idl/nsIXPCScriptable.idl
js/xpconnect/idl/nsIXPCSecurityManager.idl
js/xpconnect/idl/nsIXPConnect.idl
js/xpconnect/idl/xpcIJSGetFactory.idl
js/xpconnect/idl/xpcIJSModuleLoader.idl
js/xpconnect/idl/xpcIJSWeakReference.idl
js/xpconnect/idl/xpccomponents.idl
js/xpconnect/idl/xpcexception.idl
js/xpconnect/idl/xpcjsid.idl
js/xpconnect/loader/Makefile.in
js/xpconnect/loader/XPCOMUtils.jsm
js/xpconnect/loader/mozJSComponentLoader.cpp
js/xpconnect/loader/mozJSComponentLoader.h
js/xpconnect/loader/mozJSLoaderUtils.cpp
js/xpconnect/loader/mozJSLoaderUtils.h
js/xpconnect/loader/mozJSSubScriptLoader.cpp
js/xpconnect/loader/mozJSSubScriptLoader.h
js/xpconnect/public/Makefile.in
js/xpconnect/public/nsAXPCNativeCallContext.h
js/xpconnect/public/nsAutoJSValHolder.h
js/xpconnect/public/xpc_map_end.h
js/xpconnect/shell/Makefile.in
js/xpconnect/shell/jsshell.msg
js/xpconnect/shell/xpcshell.cpp
js/xpconnect/shell/xpcshellMacUtils.h
js/xpconnect/shell/xpcshellMacUtils.mm
js/xpconnect/src/Makefile.in
js/xpconnect/src/README
js/xpconnect/src/XPCCallContext.cpp
js/xpconnect/src/XPCComponents.cpp
js/xpconnect/src/XPCContext.cpp
js/xpconnect/src/XPCConvert.cpp
js/xpconnect/src/XPCDebug.cpp
js/xpconnect/src/XPCException.cpp
js/xpconnect/src/XPCForwards.h
js/xpconnect/src/XPCInlines.h
js/xpconnect/src/XPCJSID.cpp
js/xpconnect/src/XPCJSRuntime.cpp
js/xpconnect/src/XPCJSWeakReference.cpp
js/xpconnect/src/XPCJSWeakReference.h
js/xpconnect/src/XPCLocale.cpp
js/xpconnect/src/XPCLog.cpp
js/xpconnect/src/XPCLog.h
js/xpconnect/src/XPCMaps.cpp
js/xpconnect/src/XPCMaps.h
js/xpconnect/src/XPCModule.cpp
js/xpconnect/src/XPCModule.h
js/xpconnect/src/XPCQuickStubs.cpp
js/xpconnect/src/XPCQuickStubs.h
js/xpconnect/src/XPCRuntimeService.cpp
js/xpconnect/src/XPCStack.cpp
js/xpconnect/src/XPCString.cpp
js/xpconnect/src/XPCThreadContext.cpp
js/xpconnect/src/XPCThrower.cpp
js/xpconnect/src/XPCVariant.cpp
js/xpconnect/src/XPCWrappedJS.cpp
js/xpconnect/src/XPCWrappedJSClass.cpp
js/xpconnect/src/XPCWrappedNative.cpp
js/xpconnect/src/XPCWrappedNativeInfo.cpp
js/xpconnect/src/XPCWrappedNativeJSOps.cpp
js/xpconnect/src/XPCWrappedNativeProto.cpp
js/xpconnect/src/XPCWrappedNativeScope.cpp
js/xpconnect/src/XPCWrapper.cpp
js/xpconnect/src/XPCWrapper.h
js/xpconnect/src/codegen.py
js/xpconnect/src/dom_quickstubs.qsconf
js/xpconnect/src/dombindings.conf
js/xpconnect/src/dombindings.cpp
js/xpconnect/src/dombindings.h
js/xpconnect/src/dombindingsgen.py
js/xpconnect/src/nsCSSPropertiesQS.h
js/xpconnect/src/nsDOMQS.h
js/xpconnect/src/nsScriptError.cpp
js/xpconnect/src/nsXPConnect.cpp
js/xpconnect/src/qsWinUndefs.h
js/xpconnect/src/qsgen.py
js/xpconnect/src/xpc.msg
js/xpconnect/src/xpcprivate.h
js/xpconnect/src/xpcpublic.h
js/xpconnect/tests/Makefile.in
js/xpconnect/tests/chrome/Makefile.in
js/xpconnect/tests/chrome/bug503926.xul
js/xpconnect/tests/chrome/file_bug618176.xul
js/xpconnect/tests/chrome/file_evalInSandbox.html
js/xpconnect/tests/chrome/test_APIExposer.xul
js/xpconnect/tests/chrome/test_bug448587.xul
js/xpconnect/tests/chrome/test_bug484459.xul
js/xpconnect/tests/chrome/test_bug500931.xul
js/xpconnect/tests/chrome/test_bug503926.xul
js/xpconnect/tests/chrome/test_bug517163.xul
js/xpconnect/tests/chrome/test_bug533596.xul
js/xpconnect/tests/chrome/test_bug571849.xul
js/xpconnect/tests/chrome/test_bug596580.xul
js/xpconnect/tests/chrome/test_bug601803.xul
js/xpconnect/tests/chrome/test_bug610390.xul
js/xpconnect/tests/chrome/test_bug614757.xul
js/xpconnect/tests/chrome/test_bug616992.xul
js/xpconnect/tests/chrome/test_bug618176.xul
js/xpconnect/tests/chrome/test_bug654370.xul
js/xpconnect/tests/chrome/test_bug658560.xul
js/xpconnect/tests/chrome/test_bug664689.xul
js/xpconnect/tests/chrome/test_bug679861.xul
js/xpconnect/tests/chrome/test_cows.xul
js/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
js/xpconnect/tests/chrome/test_evalInSandbox.xul
js/xpconnect/tests/chrome/test_getweakmapkeys.xul
js/xpconnect/tests/chrome/test_nodelists.xul
js/xpconnect/tests/chrome/test_precisegc.xul
js/xpconnect/tests/chrome/test_sandboxImport.xul
js/xpconnect/tests/chrome/test_wrappers-2.xul
js/xpconnect/tests/chrome/test_wrappers.xul
js/xpconnect/tests/components/js/Makefile.in
js/xpconnect/tests/components/js/xpctest.manifest
js/xpconnect/tests/components/js/xpctest_attributes.js
js/xpconnect/tests/components/js/xpctest_params.js
js/xpconnect/tests/components/native/Makefile.in
js/xpconnect/tests/components/native/xpctest.manifest
js/xpconnect/tests/components/native/xpctest_attributes.cpp
js/xpconnect/tests/components/native/xpctest_module.cpp
js/xpconnect/tests/components/native/xpctest_params.cpp
js/xpconnect/tests/components/native/xpctest_private.h
js/xpconnect/tests/idl/Makefile.in
js/xpconnect/tests/idl/xpctest_attributes.idl
js/xpconnect/tests/idl/xpctest_params.idl
js/xpconnect/tests/mochitest/Makefile.in
js/xpconnect/tests/mochitest/bug500931_helper.html
js/xpconnect/tests/mochitest/bug504877_helper.html
js/xpconnect/tests/mochitest/bug571849_helper.html
js/xpconnect/tests/mochitest/bug589028_helper.html
js/xpconnect/tests/mochitest/bug657267.jar
js/xpconnect/tests/mochitest/bug92773_helper.html
js/xpconnect/tests/mochitest/chrome_wrappers_helper.html
js/xpconnect/tests/mochitest/file1_bug629227.html
js/xpconnect/tests/mochitest/file2_bug629227.html
js/xpconnect/tests/mochitest/file_bug505915.html
js/xpconnect/tests/mochitest/file_bug650273.html
js/xpconnect/tests/mochitest/file_bug658560.html
js/xpconnect/tests/mochitest/file_doublewrappedcompartments.html
js/xpconnect/tests/mochitest/file_evalInSandbox.html
js/xpconnect/tests/mochitest/file_nodelists.html
js/xpconnect/tests/mochitest/file_wrappers-2.html
js/xpconnect/tests/mochitest/inner.html
js/xpconnect/tests/mochitest/test1_bug629331.html
js/xpconnect/tests/mochitest/test2_bug629331.html
js/xpconnect/tests/mochitest/test_bug361111.xul
js/xpconnect/tests/mochitest/test_bug384632.html
js/xpconnect/tests/mochitest/test_bug390488.html
js/xpconnect/tests/mochitest/test_bug393269.html
js/xpconnect/tests/mochitest/test_bug396851.html
js/xpconnect/tests/mochitest/test_bug428021.html
js/xpconnect/tests/mochitest/test_bug446584.html
js/xpconnect/tests/mochitest/test_bug462428.html
js/xpconnect/tests/mochitest/test_bug478438.html
js/xpconnect/tests/mochitest/test_bug484107.html
js/xpconnect/tests/mochitest/test_bug500691.html
js/xpconnect/tests/mochitest/test_bug502959.html
js/xpconnect/tests/mochitest/test_bug503926.html
js/xpconnect/tests/mochitest/test_bug504877.html
js/xpconnect/tests/mochitest/test_bug505915.html
js/xpconnect/tests/mochitest/test_bug553407.html
js/xpconnect/tests/mochitest/test_bug560351.html
js/xpconnect/tests/mochitest/test_bug564330.html
js/xpconnect/tests/mochitest/test_bug585745.html
js/xpconnect/tests/mochitest/test_bug589028.html
js/xpconnect/tests/mochitest/test_bug601299.html
js/xpconnect/tests/mochitest/test_bug605167.html
js/xpconnect/tests/mochitest/test_bug618017.html
js/xpconnect/tests/mochitest/test_bug623437.html
js/xpconnect/tests/mochitest/test_bug628410.html
js/xpconnect/tests/mochitest/test_bug628794.html
js/xpconnect/tests/mochitest/test_bug629227.html
js/xpconnect/tests/mochitest/test_bug629331.html
js/xpconnect/tests/mochitest/test_bug636097.html
js/xpconnect/tests/mochitest/test_bug650273.html
js/xpconnect/tests/mochitest/test_bug655297.html
js/xpconnect/tests/mochitest/test_bug657267.html
js/xpconnect/tests/mochitest/test_bug661980.html
js/xpconnect/tests/mochitest/test_bug691059.html
js/xpconnect/tests/mochitest/test_bug92773.html
js/xpconnect/tests/mochitest/test_frameWrapping.html
js/xpconnect/tests/unit/CatRegistrationComponents.manifest
js/xpconnect/tests/unit/bogus_element_type.jsm
js/xpconnect/tests/unit/bogus_exports_type.jsm
js/xpconnect/tests/unit/bug451678_subscript.js
js/xpconnect/tests/unit/bug596580_versioned.js
js/xpconnect/tests/unit/component-file.js
js/xpconnect/tests/unit/component-file.manifest
js/xpconnect/tests/unit/component_import.js
js/xpconnect/tests/unit/component_import.manifest
js/xpconnect/tests/unit/recursive_importA.jsm
js/xpconnect/tests/unit/recursive_importB.jsm
js/xpconnect/tests/unit/syntax_error.jsm
js/xpconnect/tests/unit/test_attributes.js
js/xpconnect/tests/unit/test_bogus_files.js
js/xpconnect/tests/unit/test_bug408412.js
js/xpconnect/tests/unit/test_bug451678.js
js/xpconnect/tests/unit/test_bug596580.js
js/xpconnect/tests/unit/test_bug604362.js
js/xpconnect/tests/unit/test_bug608142.js
js/xpconnect/tests/unit/test_bug641378.js
js/xpconnect/tests/unit/test_bug677864.js
js/xpconnect/tests/unit/test_bug_442086.js
js/xpconnect/tests/unit/test_file.js
js/xpconnect/tests/unit/test_import.js
js/xpconnect/tests/unit/test_js_weak_references.js
js/xpconnect/tests/unit/test_localeCompare.js
js/xpconnect/tests/unit/test_params.js
js/xpconnect/tests/unit/test_recursive_import.js
js/xpconnect/tests/unit/test_reflect_parse.js
js/xpconnect/tests/unit/test_unload.js
js/xpconnect/tests/unit/test_xpcomutils.js
js/xpconnect/tests/unit/xpcshell.ini
js/xpconnect/wrappers/AccessCheck.cpp
js/xpconnect/wrappers/AccessCheck.h
js/xpconnect/wrappers/CrossOriginWrapper.cpp
js/xpconnect/wrappers/CrossOriginWrapper.h
js/xpconnect/wrappers/FilteringWrapper.cpp
js/xpconnect/wrappers/FilteringWrapper.h
js/xpconnect/wrappers/Makefile.in
js/xpconnect/wrappers/WrapperFactory.cpp
js/xpconnect/wrappers/WrapperFactory.h
js/xpconnect/wrappers/XrayWrapper.cpp
js/xpconnect/wrappers/XrayWrapper.h
layout/build/Makefile.in
layout/build/nsLayoutModule.cpp
storage/public/mozStorage.h
testing/crashtest/crashtests.list
testing/xpcshell/xpcshell.ini
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
xpcom/reflect/xptcall/porting.html
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -56,11 +56,11 @@ CPPSRCS		= \
 		nsJSPrincipals.cpp \
 		nsScriptSecurityManager.cpp \
 		nsSecurityManagerFactory.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include \
-		   -I$(topsrcdir)/js/src/xpconnect/src \
+		   -I$(topsrcdir)/js/xpconnect/src \
 		   -I$(topsrcdir)/dom/base
 
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -67,17 +67,17 @@ EXPORTS		= \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla/dom
 
 EXPORTS_mozilla/dom = \
   Link.h \
   $(NULL)
 
-LOCAL_INCLUDES = -I$(srcdir)/js/src/xpconnect/src
+LOCAL_INCLUDES = -I$(srcdir)/js/xpconnect/src
 
 CPPSRCS		= \
 		mozSanitizingSerializer.cpp \
 		nsAtomListUtils.cpp \
 		nsAttrAndChildArray.cpp \
 		nsAttrValue.cpp \
 		nsCCUncollectableMarker.cpp \
 		nsChannelPolicy.cpp \
@@ -197,17 +197,17 @@ INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../xbl/src \
 		-I$(srcdir)/../../../layout/generic \
 		-I$(srcdir)/../../../layout/style \
 		-I$(srcdir)/../../../dom/base \
 		-I$(srcdir)/../../xml/document/src \
 		-I$(topsrcdir)/xpcom/io \
 		-I$(topsrcdir)/dom/ipc \
-		-I$(topsrcdir)/js/src/xpconnect/src \
+		-I$(topsrcdir)/js/xpconnect/src \
 		-I$(topsrcdir)/caps/include \
 		-I$(topsrcdir)/netwerk/base/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 # gcc requires -msse2 for this file since it uses SSE2 intrinsics.  (See bug
 # 585538 comment 12.)
--- a/content/base/src/nsDOMFileReader.cpp
+++ b/content/base/src/nsDOMFileReader.cpp
@@ -73,17 +73,17 @@
 #include "nsIStreamConverterService.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsLayoutStatics.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsFileDataProtocolHandler.h"
 #include "mozilla/Preferences.h"
 #include "xpcprivate.h"
 #include "xpcpublic.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "jstypedarray.h"
 #include "nsDOMJSUtils.h"
 
 using namespace mozilla;
 
 #define LOAD_STR "load"
 #define LOADSTART_STR "loadstart"
 #define LOADEND_STR "loadend"
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -143,12 +143,12 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../../layout/tables \
 		-I$(srcdir)/../../../../layout/xul/base/src \
 		-I$(srcdir)/../../../../layout/generic \
 		-I$(srcdir)/../../../../dom/base \
 		-I$(srcdir)/../../../../editor/libeditor/base \
 		-I$(srcdir)/../../../../editor/libeditor/text \
 		-I$(srcdir) \
 		-I$(topsrcdir)/xpcom/ds \
-		-I$(srcdir)/../../../../js/src/xpconnect/src \
+		-I$(srcdir)/../../../../js/xpconnect/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -84,12 +84,12 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../html/document/src \
 		-I$(srcdir)/../../xml/document/src \
 		-I$(srcdir)/../../xul/content/src \
 		-I$(srcdir)/../../xul/document/src \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../../layout/style \
 		-I$(srcdir)/../../../dom/base \
 		-I$(topsrcdir)/xpcom/ds \
-		-I$(srcdir)/../../../js/src/xpconnect/src \
+		-I$(srcdir)/../../../js/xpconnect/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -114,11 +114,11 @@ CPPSRCS = \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir)/../shistory/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/layout/base \
-  -I$(topsrcdir)/js/src/xpconnect/src \
+  -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -131,17 +131,17 @@ DEFINES += -DMOZ_JSDEBUGGER
 endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
-		-I$(srcdir)/../../js/src/xpconnect/src \
-		-I$(srcdir)/../../js/src/xpconnect/wrappers \
+		-I$(topsrcdir)/js/xpconnect/src \
+		-I$(topsrcdir)/js/xpconnect/wrappers \
 		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 ifdef MOZ_X11
 CXXFLAGS += $(TK_CFLAGS)
 LDFLAGS += $(TK_LIBS)
 endif
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -92,17 +92,17 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/src/storage \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 # Make sure to quickstub as much as possible here! See
-# js/src/xpconnect/src/dom_quickstubs.qsconf.
+# js/xpconnect/src/dom_quickstubs.qsconf.
 XPIDLSRCS = \
   nsIIDBCursor.idl \
   nsIIDBCursorWithValue.idl \
   nsIIDBDatabase.idl \
   nsIIDBDatabaseException.idl \
   nsIIDBFactory.idl \
   nsIIDBIndex.idl \
   nsIIDBKeyRange.idl \
--- a/dom/workers/File.cpp
+++ b/dom/workers/File.cpp
@@ -44,17 +44,17 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jsfriendapi.h"
 #include "nsCOMPtr.h"
 #include "nsJSUtils.h"
 #include "nsStringGlue.h"
 #include "xpcprivate.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 
 #include "Exceptions.h"
 #include "WorkerInlines.h"
 #include "WorkerPrivate.h"
 
 #define PROPERTY_FLAGS \
   JSPROP_ENUMERATE | JSPROP_SHARED
 
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -72,17 +72,17 @@ CPPSRCS = \
   XMLHttpRequest.cpp \
   XMLHttpRequestPrivate.cpp \
   $(NULL)
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/js/src/xpconnect/src \
+  -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/xpcom/build \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -59,17 +59,17 @@ EXPORTS_mozilla/ipc = \
 CPPSRCS += \
   TestShellChild.cpp \
   TestShellParent.cpp \
   XPCShellEnvironment.cpp \
   $(NULL)
 
 # For xpcshell error messages and nsDependentJSString
 LOCAL_INCLUDES += \
-  -I$(topsrcdir)/js/src/xpconnect/shell \
+  -I$(topsrcdir)/js/xpconnect/shell \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS = tests
 endif
 
rename from js/src/xpconnect/Makefile.in
rename to js/xpconnect/Makefile.in
--- a/js/src/xpconnect/Makefile.in
+++ b/js/xpconnect/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 DIRS		= public idl wrappers loader src
rename from js/src/xpconnect/crashtests/117307-1.html
rename to js/xpconnect/crashtests/117307-1.html
rename from js/src/xpconnect/crashtests/193710.html
rename to js/xpconnect/crashtests/193710.html
rename from js/src/xpconnect/crashtests/290162-1.html
rename to js/xpconnect/crashtests/290162-1.html
rename from js/src/xpconnect/crashtests/326615-1.html
rename to js/xpconnect/crashtests/326615-1.html
rename from js/src/xpconnect/crashtests/328553-1.html
rename to js/xpconnect/crashtests/328553-1.html
rename from js/src/xpconnect/crashtests/346258-1.html
rename to js/xpconnect/crashtests/346258-1.html
rename from js/src/xpconnect/crashtests/346512-1-frame1.xhtml
rename to js/xpconnect/crashtests/346512-1-frame1.xhtml
rename from js/src/xpconnect/crashtests/346512-1-frame2.xhtml
rename to js/xpconnect/crashtests/346512-1-frame2.xhtml
rename from js/src/xpconnect/crashtests/346512-1.xhtml
rename to js/xpconnect/crashtests/346512-1.xhtml
rename from js/src/xpconnect/crashtests/382133-1.html
rename to js/xpconnect/crashtests/382133-1.html
rename from js/src/xpconnect/crashtests/386680-1.html
rename to js/xpconnect/crashtests/386680-1.html
rename from js/src/xpconnect/crashtests/394810-1.html
rename to js/xpconnect/crashtests/394810-1.html
rename from js/src/xpconnect/crashtests/400349-1.html
rename to js/xpconnect/crashtests/400349-1.html
rename from js/src/xpconnect/crashtests/403356-1.html
rename to js/xpconnect/crashtests/403356-1.html
rename from js/src/xpconnect/crashtests/418139-1.svg
rename to js/xpconnect/crashtests/418139-1.svg
rename from js/src/xpconnect/crashtests/420513-1.html
rename to js/xpconnect/crashtests/420513-1.html
rename from js/src/xpconnect/crashtests/453935-1.html
rename to js/xpconnect/crashtests/453935-1.html
rename from js/src/xpconnect/crashtests/462926.html
rename to js/xpconnect/crashtests/462926.html
rename from js/src/xpconnect/crashtests/467693-1.html
rename to js/xpconnect/crashtests/467693-1.html
rename from js/src/xpconnect/crashtests/468552-1.html
rename to js/xpconnect/crashtests/468552-1.html
rename from js/src/xpconnect/crashtests/471366-1.html
rename to js/xpconnect/crashtests/471366-1.html
rename from js/src/xpconnect/crashtests/475185-1.html
rename to js/xpconnect/crashtests/475185-1.html
rename from js/src/xpconnect/crashtests/475291-1.html
rename to js/xpconnect/crashtests/475291-1.html
rename from js/src/xpconnect/crashtests/503286-1.html
rename to js/xpconnect/crashtests/503286-1.html
rename from js/src/xpconnect/crashtests/504000-1.html
rename to js/xpconnect/crashtests/504000-1.html
rename from js/src/xpconnect/crashtests/509075-1.html
rename to js/xpconnect/crashtests/509075-1.html
rename from js/src/xpconnect/crashtests/512815-1.html
rename to js/xpconnect/crashtests/512815-1.html
rename from js/src/xpconnect/crashtests/515726-1.html
rename to js/xpconnect/crashtests/515726-1.html
rename from js/src/xpconnect/crashtests/545291-1.html
rename to js/xpconnect/crashtests/545291-1.html
rename from js/src/xpconnect/crashtests/558979.html
rename to js/xpconnect/crashtests/558979.html
rename from js/src/xpconnect/crashtests/582649.html
rename to js/xpconnect/crashtests/582649.html
rename from js/src/xpconnect/crashtests/601284-1.html
rename to js/xpconnect/crashtests/601284-1.html
rename from js/src/xpconnect/crashtests/603146-1.html
rename to js/xpconnect/crashtests/603146-1.html
rename from js/src/xpconnect/crashtests/603858-1.html
rename to js/xpconnect/crashtests/603858-1.html
rename from js/src/xpconnect/crashtests/608963.html
rename to js/xpconnect/crashtests/608963.html
rename from js/src/xpconnect/crashtests/616930-1.html
rename to js/xpconnect/crashtests/616930-1.html
rename from js/src/xpconnect/crashtests/639737-1.html
rename to js/xpconnect/crashtests/639737-1.html
rename from js/src/xpconnect/crashtests/648206-1.html
rename to js/xpconnect/crashtests/648206-1.html
rename from js/src/xpconnect/crashtests/crashtests.list
rename to js/xpconnect/crashtests/crashtests.list
rename from js/src/xpconnect/idl/Makefile.in
rename to js/xpconnect/idl/Makefile.in
--- a/js/src/xpconnect/idl/Makefile.in
+++ b/js/xpconnect/idl/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 GRE_MODULE	= 1
rename from js/src/xpconnect/idl/mozIJSSubScriptLoader.idl
rename to js/xpconnect/idl/mozIJSSubScriptLoader.idl
rename from js/src/xpconnect/idl/nsIJSContextStack.idl
rename to js/xpconnect/idl/nsIJSContextStack.idl
rename from js/src/xpconnect/idl/nsIJSEngineTelemetryStats.idl
rename to js/xpconnect/idl/nsIJSEngineTelemetryStats.idl
rename from js/src/xpconnect/idl/nsIJSRuntimeService.idl
rename to js/xpconnect/idl/nsIJSRuntimeService.idl
rename from js/src/xpconnect/idl/nsIScriptError.idl
rename to js/xpconnect/idl/nsIScriptError.idl
rename from js/src/xpconnect/idl/nsIXPCScriptNotify.idl
rename to js/xpconnect/idl/nsIXPCScriptNotify.idl
rename from js/src/xpconnect/idl/nsIXPCScriptable.idl
rename to js/xpconnect/idl/nsIXPCScriptable.idl
rename from js/src/xpconnect/idl/nsIXPCSecurityManager.idl
rename to js/xpconnect/idl/nsIXPCSecurityManager.idl
rename from js/src/xpconnect/idl/nsIXPConnect.idl
rename to js/xpconnect/idl/nsIXPConnect.idl
rename from js/src/xpconnect/idl/xpcIJSGetFactory.idl
rename to js/xpconnect/idl/xpcIJSGetFactory.idl
rename from js/src/xpconnect/idl/xpcIJSModuleLoader.idl
rename to js/xpconnect/idl/xpcIJSModuleLoader.idl
rename from js/src/xpconnect/idl/xpcIJSWeakReference.idl
rename to js/xpconnect/idl/xpcIJSWeakReference.idl
rename from js/src/xpconnect/idl/xpccomponents.idl
rename to js/xpconnect/idl/xpccomponents.idl
rename from js/src/xpconnect/idl/xpcexception.idl
rename to js/xpconnect/idl/xpcexception.idl
rename from js/src/xpconnect/idl/xpcjsid.idl
rename to js/xpconnect/idl/xpcjsid.idl
rename from js/src/xpconnect/loader/Makefile.in
rename to js/xpconnect/loader/Makefile.in
--- a/js/src/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -29,17 +29,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH 		= ../../../..
+DEPTH 		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= jsloader
 LIBRARY_NAME	= jsloader_s
rename from js/src/xpconnect/loader/XPCOMUtils.jsm
rename to js/xpconnect/loader/XPCOMUtils.jsm
rename from js/src/xpconnect/loader/mozJSComponentLoader.cpp
rename to js/xpconnect/loader/mozJSComponentLoader.cpp
rename from js/src/xpconnect/loader/mozJSComponentLoader.h
rename to js/xpconnect/loader/mozJSComponentLoader.h
rename from js/src/xpconnect/loader/mozJSLoaderUtils.cpp
rename to js/xpconnect/loader/mozJSLoaderUtils.cpp
rename from js/src/xpconnect/loader/mozJSLoaderUtils.h
rename to js/xpconnect/loader/mozJSLoaderUtils.h
rename from js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
rename to js/xpconnect/loader/mozJSSubScriptLoader.cpp
rename from js/src/xpconnect/loader/mozJSSubScriptLoader.h
rename to js/xpconnect/loader/mozJSSubScriptLoader.h
rename from js/src/xpconnect/public/Makefile.in
rename to js/xpconnect/public/Makefile.in
--- a/js/src/xpconnect/public/Makefile.in
+++ b/js/xpconnect/public/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 
rename from js/src/xpconnect/public/nsAXPCNativeCallContext.h
rename to js/xpconnect/public/nsAXPCNativeCallContext.h
rename from js/src/xpconnect/public/nsAutoJSValHolder.h
rename to js/xpconnect/public/nsAutoJSValHolder.h
rename from js/src/xpconnect/public/xpc_map_end.h
rename to js/xpconnect/public/xpc_map_end.h
rename from js/src/xpconnect/shell/Makefile.in
rename to js/xpconnect/shell/Makefile.in
--- a/js/src/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcshell
 PROGRAM		= xpcshell$(BIN_SUFFIX)
rename from js/src/xpconnect/shell/jsshell.msg
rename to js/xpconnect/shell/jsshell.msg
rename from js/src/xpconnect/shell/xpcshell.cpp
rename to js/xpconnect/shell/xpcshell.cpp
rename from js/src/xpconnect/shell/xpcshellMacUtils.h
rename to js/xpconnect/shell/xpcshellMacUtils.h
rename from js/src/xpconnect/shell/xpcshellMacUtils.mm
rename to js/xpconnect/shell/xpcshellMacUtils.mm
rename from js/src/xpconnect/src/Makefile.in
rename to js/xpconnect/src/Makefile.in
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -32,17 +32,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpconnect
 
@@ -51,44 +51,44 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORTS = \
 		xpcpublic.h \
 		dombindings_gen.h
 
 CPPSRCS		= \
 		nsScriptError.cpp \
 		nsXPConnect.cpp \
-		xpccallcontext.cpp \
-		xpccomponents.cpp \
-		xpccontext.cpp \
-		xpcconvert.cpp \
-		xpcdebug.cpp \
-		xpcexception.cpp \
-		xpcjsid.cpp \
-		xpcjsruntime.cpp \
-		xpclocale.cpp \
-		xpclog.cpp \
-		xpcmaps.cpp \
-		xpcmodule.cpp \
-		xpcruntimesvc.cpp  \
-		xpcstack.cpp \
-		xpcstring.cpp \
-		xpcthreadcontext.cpp \
-		xpcthrower.cpp \
-		xpcwrappedjs.cpp \
-		xpcvariant.cpp \
-		xpcwrappedjsclass.cpp \
-		xpcwrappednative.cpp \
-		xpcwrappednativeinfo.cpp \
-		xpcwrappednativejsops.cpp \
-		xpcwrappednativeproto.cpp \
-		xpcwrappednativescope.cpp \
-		xpcJSWeakReference.cpp \
+		XPCCallContext.cpp \
+		XPCComponents.cpp \
+		XPCContext.cpp \
+		XPCConvert.cpp \
+		XPCDebug.cpp \
+		XPCException.cpp \
+		XPCJSID.cpp \
+		XPCJSRuntime.cpp \
+		XPCLocale.cpp \
+		XPCLog.cpp \
+		XPCMaps.cpp \
+		XPCModule.cpp \
+		XPCRuntimeService.cpp  \
+		XPCStack.cpp \
+		XPCString.cpp \
+		XPCThreadContext.cpp \
+		XPCThrower.cpp \
+		XPCWrappedJS.cpp \
+		XPCVariant.cpp \
+		XPCWrappedJSClass.cpp \
+		XPCWrappedNative.cpp \
+		XPCWrappedNativeInfo.cpp \
+		XPCWrappedNativeJSOps.cpp \
+		XPCWrappedNativeProto.cpp \
+		XPCWrappedNativeScope.cpp \
+		XPCJSWeakReference.cpp \
 		XPCWrapper.cpp \
-		xpcquickstubs.cpp \
+		XPCQuickStubs.cpp \
 		dom_quickstubs.cpp \
 		dombindings.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
rename from js/src/xpconnect/src/README
rename to js/xpconnect/src/README
rename from js/src/xpconnect/src/xpccallcontext.cpp
rename to js/xpconnect/src/XPCCallContext.cpp
rename from js/src/xpconnect/src/xpccomponents.cpp
rename to js/xpconnect/src/XPCComponents.cpp
--- a/js/src/xpconnect/src/xpccomponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -42,17 +42,17 @@
 
 /* The "Components" xpcom objects for JavaScript. */
 
 #include "xpcprivate.h"
 #include "nsReadableUtils.h"
 #include "xpcIJSModuleLoader.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIDOMWindow.h"
-#include "xpcJSWeakReference.h"
+#include "XPCJSWeakReference.h"
 #include "XPCWrapper.h"
 #include "jsproxy.h"
 #include "WrapperFactory.h"
 #include "XrayWrapper.h"
 #include "nsNullPrincipal.h"
 #include "nsJSUtils.h"
 #include "mozJSComponentLoader.h"
 #include "nsContentUtils.h"
rename from js/src/xpconnect/src/xpccontext.cpp
rename to js/xpconnect/src/XPCContext.cpp
rename from js/src/xpconnect/src/xpcconvert.cpp
rename to js/xpconnect/src/XPCConvert.cpp
rename from js/src/xpconnect/src/xpcdebug.cpp
rename to js/xpconnect/src/XPCDebug.cpp
rename from js/src/xpconnect/src/xpcexception.cpp
rename to js/xpconnect/src/XPCException.cpp
rename from js/src/xpconnect/src/xpcforwards.h
rename to js/xpconnect/src/XPCForwards.h
rename from js/src/xpconnect/src/xpcinlines.h
rename to js/xpconnect/src/XPCInlines.h
rename from js/src/xpconnect/src/xpcjsid.cpp
rename to js/xpconnect/src/XPCJSID.cpp
rename from js/src/xpconnect/src/xpcjsruntime.cpp
rename to js/xpconnect/src/XPCJSRuntime.cpp
rename from js/src/xpconnect/src/xpcJSWeakReference.cpp
rename to js/xpconnect/src/XPCJSWeakReference.cpp
--- a/js/src/xpconnect/src/xpcJSWeakReference.cpp
+++ b/js/xpconnect/src/XPCJSWeakReference.cpp
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "xpcprivate.h"
-#include "xpcJSWeakReference.h"
+#include "XPCJSWeakReference.h"
 
 xpcJSWeakReference::xpcJSWeakReference()
 {
 }
 
 NS_IMPL_ISUPPORTS1(xpcJSWeakReference, xpcIJSWeakReference)
 
 nsresult xpcJSWeakReference::Init()
rename from js/src/xpconnect/src/xpcJSWeakReference.h
rename to js/xpconnect/src/XPCJSWeakReference.h
rename from js/src/xpconnect/src/xpclocale.cpp
rename to js/xpconnect/src/XPCLocale.cpp
rename from js/src/xpconnect/src/xpclog.cpp
rename to js/xpconnect/src/XPCLog.cpp
rename from js/src/xpconnect/src/xpclog.h
rename to js/xpconnect/src/XPCLog.h
rename from js/src/xpconnect/src/xpcmaps.cpp
rename to js/xpconnect/src/XPCMaps.cpp
rename from js/src/xpconnect/src/xpcmaps.h
rename to js/xpconnect/src/XPCMaps.h
rename from js/src/xpconnect/src/xpcmodule.cpp
rename to js/xpconnect/src/XPCModule.cpp
rename from js/src/xpconnect/src/xpcmodule.h
rename to js/xpconnect/src/XPCModule.h
rename from js/src/xpconnect/src/xpcquickstubs.cpp
rename to js/xpconnect/src/XPCQuickStubs.cpp
--- a/js/src/xpconnect/src/xpcquickstubs.cpp
+++ b/js/xpconnect/src/XPCQuickStubs.cpp
@@ -36,18 +36,18 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "jsapi.h"
 #include "jscntxt.h"  /* for error messages */
 #include "nsCOMPtr.h"
 #include "xpcprivate.h"
-#include "xpcinlines.h"
-#include "xpcquickstubs.h"
+#include "XPCInlines.h"
+#include "XPCQuickStubs.h"
 #include "XPCWrapper.h"
 
 static inline QITableEntry *
 GetOffsets(nsISupports *identity, XPCWrappedNativeProto* proto)
 {
     QITableEntry* offsets = proto ? proto->GetOffsets() : nsnull;
     if(!offsets)
     {
rename from js/src/xpconnect/src/xpcquickstubs.h
rename to js/xpconnect/src/XPCQuickStubs.h
--- a/js/src/xpconnect/src/xpcquickstubs.h
+++ b/js/xpconnect/src/XPCQuickStubs.h
@@ -37,17 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef xpcquickstubs_h___
 #define xpcquickstubs_h___
 
 #include "nsINode.h"
 
-/* xpcquickstubs.h - Support functions used only by quick stubs. */
+/* XPCQuickStubs.h - Support functions used only by quick stubs. */
 
 class XPCCallContext;
 
 #define XPC_QS_NULL_INDEX  ((size_t) -1)
 
 struct xpc_qsPropertySpec {
     const char *name;
     JSPropertyOp getter;
rename from js/src/xpconnect/src/xpcruntimesvc.cpp
rename to js/xpconnect/src/XPCRuntimeService.cpp
rename from js/src/xpconnect/src/xpcstack.cpp
rename to js/xpconnect/src/XPCStack.cpp
rename from js/src/xpconnect/src/xpcstring.cpp
rename to js/xpconnect/src/XPCString.cpp
rename from js/src/xpconnect/src/xpcthreadcontext.cpp
rename to js/xpconnect/src/XPCThreadContext.cpp
rename from js/src/xpconnect/src/xpcthrower.cpp
rename to js/xpconnect/src/XPCThrower.cpp
rename from js/src/xpconnect/src/xpcvariant.cpp
rename to js/xpconnect/src/XPCVariant.cpp
rename from js/src/xpconnect/src/xpcwrappedjs.cpp
rename to js/xpconnect/src/XPCWrappedJS.cpp
rename from js/src/xpconnect/src/xpcwrappedjsclass.cpp
rename to js/xpconnect/src/XPCWrappedJSClass.cpp
rename from js/src/xpconnect/src/xpcwrappednative.cpp
rename to js/xpconnect/src/XPCWrappedNative.cpp
--- a/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -40,19 +40,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* Wrapper object for reflecting native xpcom objects into JavaScript. */
 
 #include "xpcprivate.h"
 #include "nsCRT.h"
 #include "XPCWrapper.h"
 #include "nsWrapperCacheInlines.h"
-#include "xpclog.h"
+#include "XPCLog.h"
 #include "nsINode.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "jsproxy.h"
 #include "AccessCheck.h"
 #include "WrapperFactory.h"
 #include "dombindings.h"
 
 bool
 xpc_OkToHandOutWrapper(nsWrapperCache *cache)
 {
rename from js/src/xpconnect/src/xpcwrappednativeinfo.cpp
rename to js/xpconnect/src/XPCWrappedNativeInfo.cpp
rename from js/src/xpconnect/src/xpcwrappednativejsops.cpp
rename to js/xpconnect/src/XPCWrappedNativeJSOps.cpp
rename from js/src/xpconnect/src/xpcwrappednativeproto.cpp
rename to js/xpconnect/src/XPCWrappedNativeProto.cpp
rename from js/src/xpconnect/src/xpcwrappednativescope.cpp
rename to js/xpconnect/src/XPCWrappedNativeScope.cpp
rename from js/src/xpconnect/src/XPCWrapper.cpp
rename to js/xpconnect/src/XPCWrapper.cpp
rename from js/src/xpconnect/src/XPCWrapper.h
rename to js/xpconnect/src/XPCWrapper.h
rename from js/src/xpconnect/src/codegen.py
rename to js/xpconnect/src/codegen.py
rename from js/src/xpconnect/src/dom_quickstubs.qsconf
rename to js/xpconnect/src/dom_quickstubs.qsconf
rename from js/src/xpconnect/src/dombindings.conf
rename to js/xpconnect/src/dombindings.conf
rename from js/src/xpconnect/src/dombindings.cpp
rename to js/xpconnect/src/dombindings.cpp
--- a/js/src/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -34,17 +34,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "dombindings.h"
 #include "xpcprivate.h"
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "XPCWrapper.h"
 #include "WrapperFactory.h"
 #include "nsDOMClassInfo.h"
 #include "nsGlobalWindow.h"
 #include "jsiter.h"
 #include "nsWrapperCacheInlines.h"
 
 using namespace js;
rename from js/src/xpconnect/src/dombindings.h
rename to js/xpconnect/src/dombindings.h
rename from js/src/xpconnect/src/dombindingsgen.py
rename to js/xpconnect/src/dombindingsgen.py
rename from js/src/xpconnect/src/nsCSSPropertiesQS.h
rename to js/xpconnect/src/nsCSSPropertiesQS.h
rename from js/src/xpconnect/src/nsDOMQS.h
rename to js/xpconnect/src/nsDOMQS.h
rename from js/src/xpconnect/src/nsScriptError.cpp
rename to js/xpconnect/src/nsScriptError.cpp
rename from js/src/xpconnect/src/nsXPConnect.cpp
rename to js/xpconnect/src/nsXPConnect.cpp
--- a/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -60,17 +60,17 @@
 #include "plbase64.h"
 
 #include "XrayWrapper.h"
 #include "WrapperFactory.h"
 #include "AccessCheck.h"
 
 #include "jsdIDebuggerService.h"
 
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "dombindings.h"
 #include "nsWrapperCacheInlines.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS7(nsXPConnect,
                               nsIXPConnect,
                               nsISupportsWeakReference,
                               nsIThreadObserver,
                               nsIJSRuntimeService,
@@ -231,17 +231,17 @@ nsXPConnect::ReleaseXPConnectSingleton()
                             fclose(dumpFile);
                     }
                 }
             }
         }
 #endif
 #ifdef XPC_DUMP_AT_SHUTDOWN
         // NOTE: to see really interesting stuff turn on the prlog stuff.
-        // See the comment at the top of xpclog.h to see how to do that.
+        // See the comment at the top of XPCLog.h to see how to do that.
         xpc->DebugDump(7);
 #endif
         nsrefcnt cnt;
         NS_RELEASE2(xpc, cnt);
 #ifdef XPC_DUMP_AT_SHUTDOWN
         if(0 != cnt)
             printf("*** dangling reference to nsXPConnect: refcnt=%d\n", cnt);
         else
rename from js/src/xpconnect/src/qsWinUndefs.h
rename to js/xpconnect/src/qsWinUndefs.h
rename from js/src/xpconnect/src/qsgen.py
rename to js/xpconnect/src/qsgen.py
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/xpconnect/src/qsgen.py
@@ -1696,17 +1696,17 @@ stubTopTemplate = '''\
 #include "qsWinUndefs.h"
 #include "prtypes.h"
 #include "nsID.h"
 #include "%s"
 #include "nscore.h"
 #include "nsCOMPtr.h"
 #include "nsDependentString.h"
 #include "xpcprivate.h"  // for XPCCallContext
-#include "xpcquickstubs.h"
+#include "XPCQuickStubs.h"
 #include "nsWrapperCacheInlines.h"
 #include "jsbuiltins.h"
 '''
 
 def writeStubFile(filename, headerFilename, conf, interfaces):
     print "Creating stub file", filename
     make_targets.append(filename)
 
rename from js/src/xpconnect/src/xpc.msg
rename to js/xpconnect/src/xpc.msg
rename from js/src/xpconnect/src/xpcprivate.h
rename to js/xpconnect/src/xpcprivate.h
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -78,18 +78,18 @@
 #include "nsIInterfaceInfoManager.h"
 #include "nsIXPCScriptable.h"
 #include "nsIXPCSecurityManager.h"
 #include "nsIJSRuntimeService.h"
 #include "nsWeakReference.h"
 #include "nsCOMPtr.h"
 #include "nsXPTCUtils.h"
 #include "xptinfo.h"
-#include "xpcforwards.h"
-#include "xpclog.h"
+#include "XPCForwards.h"
+#include "XPCLog.h"
 #include "xpccomponents.h"
 #include "xpcexception.h"
 #include "xpcjsid.h"
 #include "prlong.h"
 #include "prmem.h"
 #include "prenv.h"
 #include "prclist.h"
 #include "nsString.h"
@@ -4531,18 +4531,18 @@ ParticipatesInCycleCollection(JSContext 
     return CompartmentParticipatesInCycleCollection(cx, cell->compartment());
 }
 
 }
 
 /***************************************************************************/
 // Inlines use the above - include last.
 
-#include "xpcinlines.h"
+#include "XPCInlines.h"
 
 /***************************************************************************/
 // Maps have inlines that use the above - include last.
 
-#include "xpcmaps.h"
+#include "XPCMaps.h"
 
 /***************************************************************************/
 
 #endif /* xpcprivate_h___ */
rename from js/src/xpconnect/src/xpcpublic.h
rename to js/xpconnect/src/xpcpublic.h
rename from js/src/xpconnect/tests/Makefile.in
rename to js/xpconnect/tests/Makefile.in
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/xpconnect/tests/Makefile.in
@@ -31,21 +31,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../..
+DEPTH = ../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = js/src/xpconnect/tests
+relativesrcdir = js/xpconnect/tests
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = idl mochitest chrome components/native components/js
 
 XPCSHELL_TESTS = unit
 
 LIBS = \
rename from js/src/xpconnect/tests/chrome/Makefile.in
rename to js/xpconnect/tests/chrome/Makefile.in
--- a/js/src/xpconnect/tests/chrome/Makefile.in
+++ b/js/xpconnect/tests/chrome/Makefile.in
@@ -29,21 +29,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = ../../../../..
+DEPTH     = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = js/src/xpconnect/tests/chrome
+relativesrcdir  = js/xpconnect/tests/chrome
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _CHROME_FILES = \
 		test_bug448587.xul \
 		test_bug500931.xul \
 		bug503926.xul \
rename from js/src/xpconnect/tests/chrome/bug503926.xul
rename to js/xpconnect/tests/chrome/bug503926.xul
rename from js/src/xpconnect/tests/chrome/file_bug618176.xul
rename to js/xpconnect/tests/chrome/file_bug618176.xul
rename from js/src/xpconnect/tests/chrome/file_evalInSandbox.html
rename to js/xpconnect/tests/chrome/file_evalInSandbox.html
rename from js/src/xpconnect/tests/chrome/test_APIExposer.xul
rename to js/xpconnect/tests/chrome/test_APIExposer.xul
rename from js/src/xpconnect/tests/chrome/test_bug448587.xul
rename to js/xpconnect/tests/chrome/test_bug448587.xul
rename from js/src/xpconnect/tests/chrome/test_bug484459.xul
rename to js/xpconnect/tests/chrome/test_bug484459.xul
rename from js/src/xpconnect/tests/chrome/test_bug500931.xul
rename to js/xpconnect/tests/chrome/test_bug500931.xul
--- a/js/src/xpconnect/tests/chrome/test_bug500931.xul
+++ b/js/xpconnect/tests/chrome/test_bug500931.xul
@@ -29,13 +29,13 @@ https://bugzilla.mozilla.org/show_bug.cg
     ok(weak.get().toString().indexOf("XrayWrapper") >= 0, "weak reference returns a wrapper");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/bug500931_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/bug500931_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>
rename from js/src/xpconnect/tests/chrome/test_bug503926.xul
rename to js/xpconnect/tests/chrome/test_bug503926.xul
rename from js/src/xpconnect/tests/chrome/test_bug517163.xul
rename to js/xpconnect/tests/chrome/test_bug517163.xul
rename from js/src/xpconnect/tests/chrome/test_bug533596.xul
rename to js/xpconnect/tests/chrome/test_bug533596.xul
--- a/js/src/xpconnect/tests/chrome/test_bug533596.xul
+++ b/js/xpconnect/tests/chrome/test_bug533596.xul
@@ -44,13 +44,13 @@ https://bugzilla.mozilla.org/show_bug.cg
        "unwrapping a chrome object returns the object itself");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/bug500931_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/bug500931_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>
rename from js/src/xpconnect/tests/chrome/test_bug571849.xul
rename to js/xpconnect/tests/chrome/test_bug571849.xul
--- a/js/src/xpconnect/tests/chrome/test_bug571849.xul
+++ b/js/xpconnect/tests/chrome/test_bug571849.xul
@@ -30,14 +30,14 @@ https://bugzilla.mozilla.org/show_bug.cg
     ok(/Text/.test(output[1]), "the 0th element was a text node");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/bug571849_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/bug571849_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
   </body>
 </window>
rename from js/src/xpconnect/tests/chrome/test_bug596580.xul
rename to js/xpconnect/tests/chrome/test_bug596580.xul
rename from js/src/xpconnect/tests/chrome/test_bug601803.xul
rename to js/xpconnect/tests/chrome/test_bug601803.xul
rename from js/src/xpconnect/tests/chrome/test_bug610390.xul
rename to js/xpconnect/tests/chrome/test_bug610390.xul
rename from js/src/xpconnect/tests/chrome/test_bug614757.xul
rename to js/xpconnect/tests/chrome/test_bug614757.xul
--- a/js/src/xpconnect/tests/chrome/test_bug614757.xul
+++ b/js/xpconnect/tests/chrome/test_bug614757.xul
@@ -24,11 +24,11 @@ https://bugzilla.mozilla.org/show_bug.cg
     is($('ifr').contentDocument.wrappedJSObject.getElementsByTagName('body')[0].toString().indexOf('Xray'),
        -1, "Properly deep wrap");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
-  <iframe type="content" src="http://mochi.test:8888/tests/js/src/xpconnect/tests/mochitest/file_evalInSandbox.html" onload="go()" id="ifr" />
+  <iframe type="content" src="http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_evalInSandbox.html" onload="go()" id="ifr" />
   </body>
 </window>
rename from js/src/xpconnect/tests/chrome/test_bug616992.xul
rename to js/xpconnect/tests/chrome/test_bug616992.xul
rename from js/src/xpconnect/tests/chrome/test_bug618176.xul
rename to js/xpconnect/tests/chrome/test_bug618176.xul
rename from js/src/xpconnect/tests/chrome/test_bug654370.xul
rename to js/xpconnect/tests/chrome/test_bug654370.xul
rename from js/src/xpconnect/tests/chrome/test_bug658560.xul
rename to js/xpconnect/tests/chrome/test_bug658560.xul
--- a/js/src/xpconnect/tests/chrome/test_bug658560.xul
+++ b/js/xpconnect/tests/chrome/test_bug658560.xul
@@ -27,13 +27,13 @@ https://bugzilla.mozilla.org/show_bug.cg
 
         is(win.foo, o, "should have === identity through a CrossOriginWrapper");
         SimpleTest.finish();
       }
 
   ]]></script>
 
   <iframe
-      src="http://example.org/tests/js/src/xpconnect/tests/mochitest/file_bug658560.html"
+      src="http://example.org/tests/js/xpconnect/tests/mochitest/file_bug658560.html"
           id="ifr"
           type="content"
           onload="go()" />
 </window>
rename from js/src/xpconnect/tests/chrome/test_bug664689.xul
rename to js/xpconnect/tests/chrome/test_bug664689.xul
rename from js/src/xpconnect/tests/chrome/test_bug679861.xul
rename to js/xpconnect/tests/chrome/test_bug679861.xul
rename from js/src/xpconnect/tests/chrome/test_cows.xul
rename to js/xpconnect/tests/chrome/test_cows.xul
rename from js/src/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
rename to js/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
--- a/js/src/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
+++ b/js/xpconnect/tests/chrome/test_doublewrappedcompartments.xul
@@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml">
 
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/file_doublewrappedcompartments.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/file_doublewrappedcompartments.html"
           onload="go()"
           id="ifr">
   </iframe>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
       const Ci = Components.interfaces;
rename from js/src/xpconnect/tests/chrome/test_evalInSandbox.xul
rename to js/xpconnect/tests/chrome/test_evalInSandbox.xul
--- a/js/src/xpconnect/tests/chrome/test_evalInSandbox.xul
+++ b/js/xpconnect/tests/chrome/test_evalInSandbox.xul
@@ -8,20 +8,20 @@ https://bugzilla.mozilla.org/show_bug.cg
 <window title="Mozilla Bug 533596"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml">
 
-  <iframe src="http://example.org/tests/js/src/xpconnect/tests/mochitest/file_evalInSandbox.html"
+  <iframe src="http://example.org/tests/js/xpconnect/tests/mochitest/file_evalInSandbox.html"
           onload="checkCrossOrigin(this)">
   </iframe>
-  <iframe src="chrome://mochitests/content/chrome/js/src/xpconnect/tests/chrome/file_evalInSandbox.html"
+  <iframe src="chrome://mochitests/content/chrome/js/xpconnect/tests/chrome/file_evalInSandbox.html"
           onload="checkSameOrigin(this)">
   </iframe>
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
       const Cu = Components.utils;
       const Ci = Components.interfaces;
rename from js/src/xpconnect/tests/chrome/test_getweakmapkeys.xul
rename to js/xpconnect/tests/chrome/test_getweakmapkeys.xul
rename from js/src/xpconnect/tests/chrome/test_nodelists.xul
rename to js/xpconnect/tests/chrome/test_nodelists.xul
--- a/js/src/xpconnect/tests/chrome/test_nodelists.xul
+++ b/js/xpconnect/tests/chrome/test_nodelists.xul
@@ -32,11 +32,11 @@
         is(win.document.body.removeChild(win.document.body.lastChild), list2, "remove last paragraph element");
         ok(!("2" in list), "in operator doesn't see phantom element");
         is(list[2], undefined, "no node there!");
         SimpleTest.finish();
       }
   ]]></script>
 
   <iframe id="ifr"
-          src="http://mochi.test:8888/tests/js/src/xpconnect/tests/mochitest/file_nodelists.html"
+          src="http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_nodelists.html"
           onload="go()" />
 </window>
rename from js/src/xpconnect/tests/chrome/test_precisegc.xul
rename to js/xpconnect/tests/chrome/test_precisegc.xul
rename from js/src/xpconnect/tests/chrome/test_sandboxImport.xul
rename to js/xpconnect/tests/chrome/test_sandboxImport.xul
rename from js/src/xpconnect/tests/chrome/test_wrappers-2.xul
rename to js/xpconnect/tests/chrome/test_wrappers-2.xul
--- a/js/src/xpconnect/tests/chrome/test_wrappers-2.xul
+++ b/js/xpconnect/tests/chrome/test_wrappers-2.xul
@@ -203,13 +203,13 @@ https://bugzilla.mozilla.org/show_bug.cg
         ok(false, "Allowed to wrap E4X in SJOWs?");
     } catch (e) {
     }
 
     SimpleTest.finish();
   }
   ]]></script>
   <iframe type="content"
-          src="http://mochi.test:8888/tests/js/src/xpconnect/tests/mochitest/file_wrappers-2.html"
+          src="http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_wrappers-2.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>
rename from js/src/xpconnect/tests/chrome/test_wrappers.xul
rename to js/xpconnect/tests/chrome/test_wrappers.xul
--- a/js/src/xpconnect/tests/chrome/test_wrappers.xul
+++ b/js/xpconnect/tests/chrome/test_wrappers.xul
@@ -24,17 +24,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   function go() {
     var win = $('ifr').contentWindow;
     var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
                       .getInterface(Components.interfaces.nsIDOMWindowUtils);
     is(utils.getClassName(window), "Proxy", "our window is wrapped correctly")
     is(utils.getClassName(location), "Proxy", "our location is wrapped correctly")
     is(utils.getClassName(win), "Proxy", "win is an Proxy");
     is(utils.getClassName(win.location), "Proxy", "deep wrapping works");
-    is(win.location.href, "http://example.org/tests/js/src/xpconnect/tests/mochitest/chrome_wrappers_helper.html",
+    is(win.location.href, "http://example.org/tests/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html",
        "can still get strings out");
 
     var unsafeWin = win.wrappedJSObject;
     is(utils.getClassName(unsafeWin), "Proxy", "can get a Proxy");
     is(utils.getClassName(unsafeWin.location), "Proxy", "deep wrapping works");
 
     Object.defineProperty(unsafeWin, "defprop1", { value: 1, writable: true, enumerable: true });
     /* TODO (bug 552854): the getter isn't visible in content.
@@ -61,13 +61,13 @@ https://bugzilla.mozilla.org/show_bug.cg
    ok(win.XPathEvaluator.toString().indexOf("XPathEvaluator") >= 0,
       "Can access content window.XPathEvaluator");
   }
 
   SimpleTest.waitForExplicitFinish();
 
   ]]></script>
   <iframe type="content"
-          src="http://example.org/tests/js/src/xpconnect/tests/mochitest/chrome_wrappers_helper.html"
+          src="http://example.org/tests/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html"
           onload="go()"
           id="ifr">
   </iframe>
 </window>
rename from js/src/xpconnect/tests/components/js/Makefile.in
rename to js/xpconnect/tests/components/js/Makefile.in
--- a/js/src/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../../../..
+DEPTH = ../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = xpctest
 LIBRARY_NAME = xpctest
@@ -54,15 +54,15 @@ JS_FILES = \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 MANIFEST_FILE = xpctest.manifest
 
 include $(topsrcdir)/config/rules.mk
 
-componentdir = js/src/xpconnect/tests/components/js
+componentdir = js/xpconnect/tests/components/js
 
 libs:: $(JS_FILES)
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)
 
 libs:: $(MANIFEST_FILE)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $< > $(testxpcobjdir)/$(componentdir)/$(<F)
rename from js/src/xpconnect/tests/components/js/xpctest.manifest
rename to js/xpconnect/tests/components/js/xpctest.manifest
rename from js/src/xpconnect/tests/components/js/xpctest_attributes.js
rename to js/xpconnect/tests/components/js/xpctest_attributes.js
rename from js/src/xpconnect/tests/components/js/xpctest_params.js
rename to js/xpconnect/tests/components/js/xpctest_params.js
rename from js/src/xpconnect/tests/components/native/Makefile.in
rename to js/xpconnect/tests/components/native/Makefile.in
--- a/js/src/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@@ -32,17 +32,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../../../..
+DEPTH = ../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = xpctest
 LIBRARY_NAME = xpctest
@@ -67,15 +67,15 @@ EXTRA_DSO_LDOPTS += \
   $(MOZ_JS_LIBS) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 
 DEFINES += -DLIBRARY_FILENAME="$(SHARED_LIBRARY)"
 
-componentdir = js/src/xpconnect/tests/components/native
+componentdir = js/xpconnect/tests/components/native
 
 libs:: $(SHARED_LIBRARY)
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)
 
 libs:: $(MANIFEST_FILE)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $< > $(testxpcobjdir)/$(componentdir)/$(<F)
rename from js/src/xpconnect/tests/components/native/xpctest.manifest
rename to js/xpconnect/tests/components/native/xpctest.manifest
rename from js/src/xpconnect/tests/components/native/xpctest_attributes.cpp
rename to js/xpconnect/tests/components/native/xpctest_attributes.cpp
rename from js/src/xpconnect/tests/components/native/xpctest_module.cpp
rename to js/xpconnect/tests/components/native/xpctest_module.cpp
rename from js/src/xpconnect/tests/components/native/xpctest_params.cpp
rename to js/xpconnect/tests/components/native/xpctest_params.cpp
rename from js/src/xpconnect/tests/components/native/xpctest_private.h
rename to js/xpconnect/tests/components/native/xpctest_private.h
rename from js/src/xpconnect/tests/idl/Makefile.in
rename to js/xpconnect/tests/idl/Makefile.in
--- a/js/src/xpconnect/tests/idl/Makefile.in
+++ b/js/xpconnect/tests/idl/Makefile.in
@@ -31,28 +31,28 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../../..
+DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = xpctest
 
 XPIDLSRCS = \
   xpctest_attributes.idl \
   xpctest_params.idl \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-componentdir = js/src/xpconnect/tests/components
+componentdir = js/xpconnect/tests/components
 libs:: $(XPIDL_GEN_DIR)/$(MODULE).xpt
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/native
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/js
rename from js/src/xpconnect/tests/idl/xpctest_attributes.idl
rename to js/xpconnect/tests/idl/xpctest_attributes.idl
rename from js/src/xpconnect/tests/idl/xpctest_params.idl
rename to js/xpconnect/tests/idl/xpctest_params.idl
rename from js/src/xpconnect/tests/mochitest/Makefile.in
rename to js/xpconnect/tests/mochitest/Makefile.in
--- a/js/src/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -30,21 +30,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = js/src/xpconnect/tests/mochitest
+relativesrcdir  = js/xpconnect/tests/mochitest
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES =	bug500931_helper.html \
 		inner.html \
 		bug92773_helper.html \
 		bug504877_helper.html \
rename from js/src/xpconnect/tests/mochitest/bug500931_helper.html
rename to js/xpconnect/tests/mochitest/bug500931_helper.html
rename from js/src/xpconnect/tests/mochitest/bug504877_helper.html
rename to js/xpconnect/tests/mochitest/bug504877_helper.html
rename from js/src/xpconnect/tests/mochitest/bug571849_helper.html
rename to js/xpconnect/tests/mochitest/bug571849_helper.html
rename from js/src/xpconnect/tests/mochitest/bug589028_helper.html
rename to js/xpconnect/tests/mochitest/bug589028_helper.html
rename from js/src/xpconnect/tests/mochitest/bug657267.jar
rename to js/xpconnect/tests/mochitest/bug657267.jar
rename from js/src/xpconnect/tests/mochitest/bug92773_helper.html
rename to js/xpconnect/tests/mochitest/bug92773_helper.html
rename from js/src/xpconnect/tests/mochitest/chrome_wrappers_helper.html
rename to js/xpconnect/tests/mochitest/chrome_wrappers_helper.html
rename from js/src/xpconnect/tests/mochitest/file1_bug629227.html
rename to js/xpconnect/tests/mochitest/file1_bug629227.html
rename from js/src/xpconnect/tests/mochitest/file2_bug629227.html
rename to js/xpconnect/tests/mochitest/file2_bug629227.html
rename from js/src/xpconnect/tests/mochitest/file_bug505915.html
rename to js/xpconnect/tests/mochitest/file_bug505915.html
rename from js/src/xpconnect/tests/mochitest/file_bug650273.html
rename to js/xpconnect/tests/mochitest/file_bug650273.html
rename from js/src/xpconnect/tests/mochitest/file_bug658560.html
rename to js/xpconnect/tests/mochitest/file_bug658560.html
rename from js/src/xpconnect/tests/mochitest/file_doublewrappedcompartments.html
rename to js/xpconnect/tests/mochitest/file_doublewrappedcompartments.html
rename from js/src/xpconnect/tests/mochitest/file_evalInSandbox.html
rename to js/xpconnect/tests/mochitest/file_evalInSandbox.html
rename from js/src/xpconnect/tests/mochitest/file_nodelists.html
rename to js/xpconnect/tests/mochitest/file_nodelists.html
rename from js/src/xpconnect/tests/mochitest/file_wrappers-2.html
rename to js/xpconnect/tests/mochitest/file_wrappers-2.html
rename from js/src/xpconnect/tests/mochitest/inner.html
rename to js/xpconnect/tests/mochitest/inner.html
rename from js/src/xpconnect/tests/mochitest/test1_bug629331.html
rename to js/xpconnect/tests/mochitest/test1_bug629331.html
--- a/js/src/xpconnect/tests/mochitest/test1_bug629331.html
+++ b/js/xpconnect/tests/mochitest/test1_bug629331.html
@@ -8,12 +8,12 @@ function finish() {
 
 function is(a, b, description) {
     parent.postMessage(JSON.stringify({ fun: "is", a: a, b: b, description: description }), "*");
 }
 
 document.domain = "example.org";
 var i = 0;
 is(i, 0, 'i meets starting conditions');
-document.getElementById('ifr').src = 'http://test2.example.org/tests/js/src/xpconnect/tests/mochitest/test2_bug629331.html';
+document.getElementById('ifr').src = 'http://test2.example.org/tests/js/xpconnect/tests/mochitest/test2_bug629331.html';
 </script>
 
 
rename from js/src/xpconnect/tests/mochitest/test2_bug629331.html
rename to js/xpconnect/tests/mochitest/test2_bug629331.html
rename from js/src/xpconnect/tests/mochitest/test_bug361111.xul
rename to js/xpconnect/tests/mochitest/test_bug361111.xul
rename from js/src/xpconnect/tests/mochitest/test_bug384632.html
rename to js/xpconnect/tests/mochitest/test_bug384632.html
rename from js/src/xpconnect/tests/mochitest/test_bug390488.html
rename to js/xpconnect/tests/mochitest/test_bug390488.html
rename from js/src/xpconnect/tests/mochitest/test_bug393269.html
rename to js/xpconnect/tests/mochitest/test_bug393269.html
rename from js/src/xpconnect/tests/mochitest/test_bug396851.html
rename to js/xpconnect/tests/mochitest/test_bug396851.html
--- a/js/src/xpconnect/tests/mochitest/test_bug396851.html
+++ b/js/xpconnect/tests/mochitest/test_bug396851.html
@@ -30,13 +30,13 @@ https://bugzilla.mozilla.org/show_bug.cg
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=396851">Mozilla Bug 396851</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <script type="text/javascript">
     SimpleTest.waitForExplicitFinish();
 </script>
 <iframe id="ifr"
-        src="http://example.org/tests/js/src/xpconnect/tests/mochitest/inner.html"
+        src="http://example.org/tests/js/xpconnect/tests/mochitest/inner.html"
         onload="go()">
 </iframe>
 </body>
 </html>
rename from js/src/xpconnect/tests/mochitest/test_bug428021.html
rename to js/xpconnect/tests/mochitest/test_bug428021.html
rename from js/src/xpconnect/tests/mochitest/test_bug446584.html
rename to js/xpconnect/tests/mochitest/test_bug446584.html
rename from js/src/xpconnect/tests/mochitest/test_bug462428.html
rename to js/xpconnect/tests/mochitest/test_bug462428.html
rename from js/src/xpconnect/tests/mochitest/test_bug478438.html
rename to js/xpconnect/tests/mochitest/test_bug478438.html
rename from js/src/xpconnect/tests/mochitest/test_bug484107.html
rename to js/xpconnect/tests/mochitest/test_bug484107.html
rename from js/src/xpconnect/tests/mochitest/test_bug500691.html
rename to js/xpconnect/tests/mochitest/test_bug500691.html
rename from js/src/xpconnect/tests/mochitest/test_bug502959.html
rename to js/xpconnect/tests/mochitest/test_bug502959.html
rename from js/src/xpconnect/tests/mochitest/test_bug503926.html
rename to js/xpconnect/tests/mochitest/test_bug503926.html
rename from js/src/xpconnect/tests/mochitest/test_bug504877.html
rename to js/xpconnect/tests/mochitest/test_bug504877.html
--- a/js/src/xpconnect/tests/mochitest/test_bug504877.html
+++ b/js/xpconnect/tests/mochitest/test_bug504877.html
@@ -54,11 +54,11 @@ function go() {
         case 1: return test1();
         case 2: return test2();
     }
 }
 
 
 </script>
 </pre>
-<iframe src="http://example.org/tests/js/src/xpconnect/tests/mochitest/bug504877_helper.html" id="ifr" onload="go()"></iframe>
+<iframe src="http://example.org/tests/js/xpconnect/tests/mochitest/bug504877_helper.html" id="ifr" onload="go()"></iframe>
 </body>
 </html>
rename from js/src/xpconnect/tests/mochitest/test_bug505915.html
rename to js/xpconnect/tests/mochitest/test_bug505915.html
--- a/js/src/xpconnect/tests/mochitest/test_bug505915.html
+++ b/js/xpconnect/tests/mochitest/test_bug505915.html
@@ -36,17 +36,17 @@ function go() {
     } catch (e) {
         ok(/NS_ERROR_XPC_SECURITY_MANAGER_VETO/.test(e),
            "threw a security exception instead of an invalid child exception");
     }
 
     // Location is always wrapped, so test it separately.
 
     ifr.onload = null;
-    var path = "/tests/js/src/xpconnect/tests/mochitest/file_bug505915.html";
+    var path = "/tests/js/xpconnect/tests/mochitest/file_bug505915.html";
 
     ifr.contentWindow.location = "http://mochi.test:8888/" + path;
     yield;
     try {
         document.documentElement.appendChild(ifr.contentWindow.location);
         ok(false, "weird behavior");
     } catch (e) {
         ok(!/NS_ERROR_XPC_SECURITY_MANAGER_VETO/.test(e),
rename from js/src/xpconnect/tests/mochitest/test_bug553407.html
rename to js/xpconnect/tests/mochitest/test_bug553407.html
rename from js/src/xpconnect/tests/mochitest/test_bug560351.html
rename to js/xpconnect/tests/mochitest/test_bug560351.html
rename from js/src/xpconnect/tests/mochitest/test_bug564330.html
rename to js/xpconnect/tests/mochitest/test_bug564330.html
rename from js/src/xpconnect/tests/mochitest/test_bug585745.html
rename to js/xpconnect/tests/mochitest/test_bug585745.html
rename from js/src/xpconnect/tests/mochitest/test_bug589028.html
rename to js/xpconnect/tests/mochitest/test_bug589028.html
rename from js/src/xpconnect/tests/mochitest/test_bug601299.html
rename to js/xpconnect/tests/mochitest/test_bug601299.html
rename from js/src/xpconnect/tests/mochitest/test_bug605167.html
rename to js/xpconnect/tests/mochitest/test_bug605167.html
rename from js/src/xpconnect/tests/mochitest/test_bug618017.html
rename to js/xpconnect/tests/mochitest/test_bug618017.html
rename from js/src/xpconnect/tests/mochitest/test_bug623437.html
rename to js/xpconnect/tests/mochitest/test_bug623437.html
rename from js/src/xpconnect/tests/mochitest/test_bug628410.html
rename to js/xpconnect/tests/mochitest/test_bug628410.html
rename from js/src/xpconnect/tests/mochitest/test_bug628794.html
rename to js/xpconnect/tests/mochitest/test_bug628794.html
rename from js/src/xpconnect/tests/mochitest/test_bug629227.html
rename to js/xpconnect/tests/mochitest/test_bug629227.html
rename from js/src/xpconnect/tests/mochitest/test_bug629331.html
rename to js/xpconnect/tests/mochitest/test_bug629331.html
--- a/js/src/xpconnect/tests/mochitest/test_bug629331.html
+++ b/js/xpconnect/tests/mochitest/test_bug629331.html
@@ -25,13 +25,13 @@ function handler(event) {
     } else {
         is(obj.a, obj.b, obj.description);
     }
 }
 
 window.addEventListener('message', handler, false);
 
 </script>
-<iframe src="http://test1.example.org/tests/js/src/xpconnect/tests/mochitest/test1_bug629331.html">
+<iframe src="http://test1.example.org/tests/js/xpconnect/tests/mochitest/test1_bug629331.html">
 </iframe>
 </pre>
 </body>
 </html>
rename from js/src/xpconnect/tests/mochitest/test_bug636097.html
rename to js/xpconnect/tests/mochitest/test_bug636097.html
rename from js/src/xpconnect/tests/mochitest/test_bug650273.html
rename to js/xpconnect/tests/mochitest/test_bug650273.html
rename from js/src/xpconnect/tests/mochitest/test_bug655297.html
rename to js/xpconnect/tests/mochitest/test_bug655297.html
rename from js/src/xpconnect/tests/mochitest/test_bug657267.html
rename to js/xpconnect/tests/mochitest/test_bug657267.html
--- a/js/src/xpconnect/tests/mochitest/test_bug657267.html
+++ b/js/xpconnect/tests/mochitest/test_bug657267.html
@@ -31,14 +31,14 @@ function go() {
     }
     ok(thrown, "Should have thrown");
     SimpleTest.finish();
 }
 
 </script>
 </pre>
 
-<iframe src="jar:http://mochi.test:8888/tests/js/src/xpconnect/tests/mochitest/bug657267.jar!/file_bug657267.html"
+<iframe src="jar:http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/bug657267.jar!/file_bug657267.html"
         id="ifr"
         onload="go()">
 </iframe>
 </body>
 </html>
rename from js/src/xpconnect/tests/mochitest/test_bug661980.html
rename to js/xpconnect/tests/mochitest/test_bug661980.html
rename from js/src/xpconnect/tests/mochitest/test_bug691059.html
rename to js/xpconnect/tests/mochitest/test_bug691059.html
rename from js/src/xpconnect/tests/mochitest/test_bug92773.html
rename to js/xpconnect/tests/mochitest/test_bug92773.html
--- a/js/src/xpconnect/tests/mochitest/test_bug92773.html
+++ b/js/xpconnect/tests/mochitest/test_bug92773.html
@@ -30,14 +30,14 @@ function go() {
     SimpleTest.finish();
 }
 SimpleTest.waitForExplicitFinish();
 
 </script>
 </pre>
 
 <iframe id='ifr'
-        src='http://example.com/tests/js/src/xpconnect/tests/mochitest/bug92773_helper.html'
+        src='http://example.com/tests/js/xpconnect/tests/mochitest/bug92773_helper.html'
         onload="go()">
 </iframe>
 
 </body>
 </html>
rename from js/src/xpconnect/tests/mochitest/test_frameWrapping.html
rename to js/xpconnect/tests/mochitest/test_frameWrapping.html
rename from js/src/xpconnect/tests/unit/CatRegistrationComponents.manifest
rename to js/xpconnect/tests/unit/CatRegistrationComponents.manifest
rename from js/src/xpconnect/tests/unit/bogus_element_type.jsm
rename to js/xpconnect/tests/unit/bogus_element_type.jsm
rename from js/src/xpconnect/tests/unit/bogus_exports_type.jsm
rename to js/xpconnect/tests/unit/bogus_exports_type.jsm
rename from js/src/xpconnect/tests/unit/bug451678_subscript.js
rename to js/xpconnect/tests/unit/bug451678_subscript.js
rename from js/src/xpconnect/tests/unit/bug596580_versioned.js
rename to js/xpconnect/tests/unit/bug596580_versioned.js
rename from js/src/xpconnect/tests/unit/component-file.js
rename to js/xpconnect/tests/unit/component-file.js
rename from js/src/xpconnect/tests/unit/component-file.manifest
rename to js/xpconnect/tests/unit/component-file.manifest
rename from js/src/xpconnect/tests/unit/component_import.js
rename to js/xpconnect/tests/unit/component_import.js
rename from js/src/xpconnect/tests/unit/component_import.manifest
rename to js/xpconnect/tests/unit/component_import.manifest
rename from js/src/xpconnect/tests/unit/recursive_importA.jsm
rename to js/xpconnect/tests/unit/recursive_importA.jsm
rename from js/src/xpconnect/tests/unit/recursive_importB.jsm
rename to js/xpconnect/tests/unit/recursive_importB.jsm
rename from js/src/xpconnect/tests/unit/syntax_error.jsm
rename to js/xpconnect/tests/unit/syntax_error.jsm
rename from js/src/xpconnect/tests/unit/test_attributes.js
rename to js/xpconnect/tests/unit/test_attributes.js
rename from js/src/xpconnect/tests/unit/test_bogus_files.js
rename to js/xpconnect/tests/unit/test_bogus_files.js
rename from js/src/xpconnect/tests/unit/test_bug408412.js
rename to js/xpconnect/tests/unit/test_bug408412.js
rename from js/src/xpconnect/tests/unit/test_bug451678.js
rename to js/xpconnect/tests/unit/test_bug451678.js
rename from js/src/xpconnect/tests/unit/test_bug596580.js
rename to js/xpconnect/tests/unit/test_bug596580.js
rename from js/src/xpconnect/tests/unit/test_bug604362.js
rename to js/xpconnect/tests/unit/test_bug604362.js
rename from js/src/xpconnect/tests/unit/test_bug608142.js
rename to js/xpconnect/tests/unit/test_bug608142.js
rename from js/src/xpconnect/tests/unit/test_bug641378.js
rename to js/xpconnect/tests/unit/test_bug641378.js
rename from js/src/xpconnect/tests/unit/test_bug677864.js
rename to js/xpconnect/tests/unit/test_bug677864.js
rename from js/src/xpconnect/tests/unit/test_bug_442086.js
rename to js/xpconnect/tests/unit/test_bug_442086.js
rename from js/src/xpconnect/tests/unit/test_file.js
rename to js/xpconnect/tests/unit/test_file.js
rename from js/src/xpconnect/tests/unit/test_import.js
rename to js/xpconnect/tests/unit/test_import.js
rename from js/src/xpconnect/tests/unit/test_js_weak_references.js
rename to js/xpconnect/tests/unit/test_js_weak_references.js
rename from js/src/xpconnect/tests/unit/test_localeCompare.js
rename to js/xpconnect/tests/unit/test_localeCompare.js
rename from js/src/xpconnect/tests/unit/test_params.js
rename to js/xpconnect/tests/unit/test_params.js
rename from js/src/xpconnect/tests/unit/test_recursive_import.js
rename to js/xpconnect/tests/unit/test_recursive_import.js
rename from js/src/xpconnect/tests/unit/test_reflect_parse.js
rename to js/xpconnect/tests/unit/test_reflect_parse.js
rename from js/src/xpconnect/tests/unit/test_unload.js
rename to js/xpconnect/tests/unit/test_unload.js
rename from js/src/xpconnect/tests/unit/test_xpcomutils.js
rename to js/xpconnect/tests/unit/test_xpcomutils.js
rename from js/src/xpconnect/tests/unit/xpcshell.ini
rename to js/xpconnect/tests/unit/xpcshell.ini
rename from js/src/xpconnect/wrappers/AccessCheck.cpp
rename to js/xpconnect/wrappers/AccessCheck.cpp
rename from js/src/xpconnect/wrappers/AccessCheck.h
rename to js/xpconnect/wrappers/AccessCheck.h
rename from js/src/xpconnect/wrappers/CrossOriginWrapper.cpp
rename to js/xpconnect/wrappers/CrossOriginWrapper.cpp
rename from js/src/xpconnect/wrappers/CrossOriginWrapper.h
rename to js/xpconnect/wrappers/CrossOriginWrapper.h
rename from js/src/xpconnect/wrappers/FilteringWrapper.cpp
rename to js/xpconnect/wrappers/FilteringWrapper.cpp
rename from js/src/xpconnect/wrappers/FilteringWrapper.h
rename to js/xpconnect/wrappers/FilteringWrapper.h
rename from js/src/xpconnect/wrappers/Makefile.in
rename to js/xpconnect/wrappers/Makefile.in
--- a/js/src/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH 		= ../../../..
+DEPTH 		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcwrappers
 LIBRARY_NAME	= xpcwrappers_s
rename from js/src/xpconnect/wrappers/WrapperFactory.cpp
rename to js/xpconnect/wrappers/WrapperFactory.cpp
--- a/js/src/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/xpconnect/wrappers/WrapperFactory.cpp
@@ -41,17 +41,17 @@
 #include "CrossOriginWrapper.h"
 #include "FilteringWrapper.h"
 #include "XrayWrapper.h"
 #include "AccessCheck.h"
 #include "XPCWrapper.h"
 
 #include "xpcprivate.h"
 #include "dombindings.h"
-#include "xpcmaps.h"
+#include "XPCMaps.h"
 
 using namespace js;
 
 namespace xpc {
 
 // When chrome pulls a naked property across the membrane using
 // .wrappedJSObject, we want it to cross the membrane into the
 // chrome compartment without automatically being wrapped into an
rename from js/src/xpconnect/wrappers/WrapperFactory.h
rename to js/xpconnect/wrappers/WrapperFactory.h
rename from js/src/xpconnect/wrappers/XrayWrapper.cpp
rename to js/xpconnect/wrappers/XrayWrapper.cpp
rename from js/src/xpconnect/wrappers/XrayWrapper.h
rename to js/xpconnect/wrappers/XrayWrapper.h
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -231,17 +231,17 @@ SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/smil/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef ENABLE_EDITOR_API_LOG
 DEFINES += -DENABLE_EDITOR_API_LOG
 endif
 
 SHARED_LIBRARY_LIBS += \
-	$(DEPTH)/js/src/xpconnect/src/$(LIB_PREFIX)xpconnect_s.$(LIB_SUFFIX)
+	$(DEPTH)/js/xpconnect/src/$(LIB_PREFIX)xpconnect_s.$(LIB_SUFFIX)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   -I$(srcdir)/../generic \
@@ -273,16 +273,16 @@ LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   -I$(topsrcdir)/dom/src/offline \
 		   -I$(topsrcdir)/dom/src/geolocation \
 		   -I. \
 		   -I$(topsrcdir)/editor/libeditor/base \
 		   -I$(topsrcdir)/editor/libeditor/text \
 		   -I$(topsrcdir)/editor/libeditor/html \
 		   -I$(topsrcdir)/editor/txtsvc/src \
 		   -I$(topsrcdir)/editor/composer/src \
-		   -I$(topsrcdir)/js/src/xpconnect/src \
-		   -I$(topsrcdir)/js/src/xpconnect/loader \
+		   -I$(topsrcdir)/js/xpconnect/src \
+		   -I$(topsrcdir)/js/xpconnect/loader \
 		   -I$(topsrcdir)/caps/include \
 		   -I$(topsrcdir)/netwerk/base/src \
 		   -I$(topsrcdir)/content/svg/content/src \
 		   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -33,17 +33,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "base/basictypes.h"
 
-#include "xpcmodule.h"
+#include "XPCModule.h"
 #include "mozilla/ModuleUtils.h"
 #include "nsLayoutStatics.h"
 #include "nsContentCID.h"
 #include "nsContentDLF.h"
 #include "nsContentPolicyUtils.h"
 #include "nsDataDocumentContentPolicy.h"
 #include "nsNoDataProtocolContentPolicy.h"
 #include "nsDOMCID.h"
--- a/storage/public/mozStorage.h
+++ b/storage/public/mozStorage.h
@@ -37,17 +37,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 /**
  * To add additional errors to Storage, please append entries to the bottom of
  * the list in the following format:
  * '#define NS_ERROR_STORAGE_YOUR_ERR \
  *    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_STORAGE, n)'
  * where n is the next unique positive integer.  You must also add an entry to
- * js/src/xpconnect/src/xpc.msg under the code block beginning with the comment
+ * js/xpconnect/src/xpc.msg under the code block beginning with the comment
  * 'storage related codes (from mozStorage.h)', in the following format:
  * 'XPC_MSG_DEF(NS_ERROR_STORAGE_YOUR_ERR, "brief description of your error")'
  */
 
 #ifndef MOZSTORAGE_H
 #define MOZSTORAGE_H
 
 #define NS_ERROR_STORAGE_BUSY \
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -26,17 +26,17 @@ include ../../dom/base/crashtests/crasht
 include ../../dom/src/offline/crashtests/crashtests.list
 include ../../dom/src/jsurl/crashtests/crashtests.list
 
 include ../../editor/crashtests.list
 
 include ../../intl/lwbrk/src/crashtests/crashtests.list
 include ../../intl/uconv/crashtests/crashtests.list
 
-include ../../js/src/xpconnect/crashtests/crashtests.list
+include ../../js/xpconnect/crashtests/crashtests.list
 
 include ../../layout/base/crashtests/crashtests.list
 include ../../layout/forms/crashtests/crashtests.list
 include ../../layout/generic/crashtests/crashtests.list
 include ../../layout/mathml/crashtests/crashtests.list
 include ../../layout/style/crashtests/crashtests.list
 include ../../layout/svg/crashtests/crashtests.list
 include ../../layout/tables/crashtests/crashtests.list
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -43,17 +43,17 @@ skip-if = os == "android"
 [include:modules/libpref/test/unit/xpcshell.ini]
 [include:intl/strres/tests/unit/xpcshell.ini]
 [include:intl/unicharutil/tests/unit/xpcshell.ini]
 [include:intl/uconv/tests/unit/xpcshell.ini]
 [include:netwerk/test/unit/xpcshell.ini]
 [include:netwerk/test/httpserver/test/xpcshell.ini]
 [include:js/ductwork/debugger/tests/xpcshell.ini]
 [include:js/jetpack/tests/unit/xpcshell.ini]
-[include:js/src/xpconnect/tests/unit/xpcshell.ini]
+[include:js/xpconnect/tests/unit/xpcshell.ini]
 [include:modules/libjar/test/unit/xpcshell.ini]
 [include:extensions/cookie/test/unit/xpcshell.ini]
 [include:storage/test/unit/xpcshell.ini]
 [include:rdf/tests/unit/xpcshell.ini]
 [include:gfx/tests/unit/xpcshell.ini]
 [include:widget/tests/unit/xpcshell.ini]
 [include:content/base/test/unit/xpcshell.ini]
 [include:content/test/unit/xpcshell.ini]
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -184,26 +184,26 @@ MAKEFILES_intl="
   intl/unicharutil/tools/Makefile
   intl/strres/Makefile
   intl/strres/public/Makefile
   intl/strres/src/Makefile
   intl/strres/tests/Makefile
 "
 
 MAKEFILES_xpconnect="
-  js/src/xpconnect/Makefile
-  js/src/xpconnect/public/Makefile
-  js/src/xpconnect/idl/Makefile
-  js/src/xpconnect/shell/Makefile
-  js/src/xpconnect/src/Makefile
-  js/src/xpconnect/loader/Makefile
-  js/src/xpconnect/tests/Makefile
-  js/src/xpconnect/tests/components/js/Makefile
-  js/src/xpconnect/tests/components/native/Makefile
-  js/src/xpconnect/tests/idl/Makefile
+  js/xpconnect/Makefile
+  js/xpconnect/public/Makefile
+  js/xpconnect/idl/Makefile
+  js/xpconnect/shell/Makefile
+  js/xpconnect/src/Makefile
+  js/xpconnect/loader/Makefile
+  js/xpconnect/tests/Makefile
+  js/xpconnect/tests/components/js/Makefile
+  js/xpconnect/tests/components/native/Makefile
+  js/xpconnect/tests/idl/Makefile
 "
 
 MAKEFILES_jsipc="
   js/ipc/Makefile
 "
 
 MAKEFILES_jsdebugger="
   js/jsd/Makefile
@@ -841,17 +841,17 @@ if [ "$ENABLE_TESTS" ]; then
     dom/tests/mochitest/localstorage/Makefile
     dom/tests/mochitest/sessionstorage/Makefile
     dom/tests/mochitest/whatwg/Makefile
     editor/libeditor/html/tests/Makefile
     editor/libeditor/text/tests/Makefile
     embedding/test/Makefile
     extensions/cookie/test/Makefile
     extensions/pref/Makefile
-    js/src/xpconnect/tests/mochitest/Makefile
+    js/xpconnect/tests/mochitest/Makefile
     layout/forms/test/Makefile
     layout/generic/test/Makefile
     layout/inspector/tests/Makefile
     layout/reftests/fonts/Makefile
     layout/reftests/fonts/mplus/Makefile
     layout/style/test/Makefile
     layout/tables/test/Makefile
     layout/tools/pageloader/Makefile
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -90,17 +90,17 @@ tier_platform_dirs	+= gfx/qcms
 #
 # "gecko" - core components
 #
 
 tier_platform_dirs += ipc js/ipc js/jetpack
 
 tier_platform_dirs += \
 		hal \
-		js/src/xpconnect \
+		js/xpconnect \
 		intl/chardet \
 		$(NULL)
 
 ifdef MOZ_ENABLE_GTK2
 ifdef MOZ_X11
 tier_platform_dirs     += widget/src/gtkxtbin
 endif
 endif
--- a/xpcom/reflect/xptcall/porting.html
+++ b/xpcom/reflect/xptcall/porting.html
@@ -181,17 +181,17 @@ href="http://lxr.mozilla.org/mozilla/sou
 the <i>stubs</i> functionality. Such a test ought to be written, but this has not
 yet been done.
 
 <p>
 
 A full 'test' at this point requires building the client and running the
 XPConnect test called <i>TestXPC</i> in
 <a
-href="http://lxr.mozilla.org/mozilla/source/js/src/xpconnect/tests">mozilla/js/src/xpconnect/tests
+href="http://lxr.mozilla.org/mozilla/source/js/xpconnect/tests">mozilla/js/xpconnect/tests
 </a>.
 
 <p>
 
 Getting these ports done is very important. Please let <a
 href="mailto:jband@netscape.com">me</a> know if you are interested in doing one.
 I'll answer any questions as I get them.