Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Sun, 27 Apr 2014 03:06:00 -0400
changeset 180485 6c1c7e45c90289a0875b74f82f39e7ecf6a65af3
parent 180484 2d59f550103f36528eb4664c9846cba2705a6481
child 180486 bb248db2c54c458c3e4e5f1cb9e3a1d8c3187f4f
push id6534
push userryanvm@gmail.com
push dateMon, 28 Apr 2014 01:27:29 +0000
treeherderfx-team@4d926af89907 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs900908
milestone31.0a1
Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj
accessible/src/base/DocManager.cpp
accessible/src/base/nsAccessibilityService.cpp
accessible/src/generic/ARIAGridAccessible.cpp
accessible/src/generic/ApplicationAccessible.cpp
accessible/src/generic/FormControlAccessible.cpp
accessible/src/generic/ImageAccessible.cpp
accessible/src/generic/RootAccessible.cpp
accessible/src/html/HTMLFormControlAccessible.cpp
accessible/src/html/HTMLLinkAccessible.cpp
accessible/src/html/HTMLTableAccessible.cpp
accessible/src/xpcom/nsAccessibleRelation.cpp
accessible/src/xul/XULElementAccessibles.cpp
accessible/src/xul/XULListboxAccessible.cpp
accessible/src/xul/XULTreeAccessible.cpp
accessible/src/xul/XULTreeGridAccessible.cpp
browser/components/about/AboutRedirector.cpp
browser/components/dirprovider/DirectoryProvider.cpp
browser/components/feeds/src/nsFeedSniffer.cpp
browser/components/migration/src/nsIEHistoryEnumerator.cpp
browser/components/shell/src/nsGNOMEShellService.cpp
browser/components/shell/src/nsMacShellService.cpp
browser/components/shell/src/nsWindowsShellService.cpp
caps/src/DomainPolicy.cpp
caps/src/nsNullPrincipal.cpp
caps/src/nsPrincipal.cpp
caps/src/nsScriptSecurityManager.cpp
caps/src/nsSecurityManagerFactory.cpp
caps/src/nsSystemPrincipal.cpp
chrome/src/nsChromeProtocolHandler.cpp
content/base/src/Attr.cpp
content/base/src/Comment.cpp
content/base/src/DOMRect.cpp
content/base/src/DocumentType.cpp
content/base/src/FragmentOrElement.cpp
content/base/src/ThirdPartyUtil.cpp
content/base/src/nsCCUncollectableMarker.cpp
content/base/src/nsCSPService.cpp
content/base/src/nsChannelPolicy.cpp
content/base/src/nsContentAreaDragDrop.cpp
content/base/src/nsContentList.cpp
content/base/src/nsContentPolicy.cpp
content/base/src/nsContentUtils.cpp
content/base/src/nsCrossSiteListenerProxy.cpp
content/base/src/nsDOMAttributeMap.cpp
content/base/src/nsDOMBlobBuilder.cpp
content/base/src/nsDOMFile.cpp
content/base/src/nsDataDocumentContentPolicy.cpp
content/base/src/nsDocument.cpp
content/base/src/nsFrameLoader.cpp
content/base/src/nsFrameMessageManager.cpp
content/base/src/nsGenConImageContent.cpp
content/base/src/nsHostObjectProtocolHandler.cpp
content/base/src/nsMappedAttributes.cpp
content/base/src/nsMixedContentBlocker.cpp
content/base/src/nsNoDataProtocolContentPolicy.cpp
content/base/src/nsNodeInfo.cpp
content/base/src/nsObjectLoadingContent.cpp
content/base/src/nsPlainTextSerializer.cpp
content/base/src/nsReferencedElement.cpp
content/base/src/nsScriptLoader.cpp
content/base/src/nsSyncLoadService.cpp
content/base/src/nsTextNode.cpp
content/base/src/nsXMLContentSerializer.cpp
content/base/src/nsXMLHttpRequest.cpp
content/canvas/src/CanvasImageCache.cpp
content/canvas/src/CanvasRenderingContext2D.cpp
content/canvas/src/ImageEncoder.cpp
content/canvas/src/WebGLContextReporter.cpp
content/html/content/src/HTMLAnchorElement.cpp
content/html/content/src/HTMLAreaElement.cpp
content/html/content/src/HTMLAudioElement.cpp
content/html/content/src/HTMLBRElement.cpp
content/html/content/src/HTMLBodyElement.cpp
content/html/content/src/HTMLButtonElement.cpp
content/html/content/src/HTMLCanvasElement.cpp
content/html/content/src/HTMLContentElement.cpp
content/html/content/src/HTMLDivElement.cpp
content/html/content/src/HTMLFieldSetElement.cpp
content/html/content/src/HTMLFormControlsCollection.cpp
content/html/content/src/HTMLFormElement.cpp
content/html/content/src/HTMLFrameElement.cpp
content/html/content/src/HTMLFrameSetElement.cpp
content/html/content/src/HTMLHRElement.cpp
content/html/content/src/HTMLHeadingElement.cpp
content/html/content/src/HTMLIFrameElement.cpp
content/html/content/src/HTMLImageElement.cpp
content/html/content/src/HTMLInputElement.cpp
content/html/content/src/HTMLLIElement.cpp
content/html/content/src/HTMLLabelElement.cpp
content/html/content/src/HTMLLinkElement.cpp
content/html/content/src/HTMLMapElement.cpp
content/html/content/src/HTMLMediaElement.cpp
content/html/content/src/HTMLMenuElement.cpp
content/html/content/src/HTMLMenuItemElement.cpp
content/html/content/src/HTMLMetaElement.cpp
content/html/content/src/HTMLObjectElement.cpp
content/html/content/src/HTMLOptGroupElement.cpp
content/html/content/src/HTMLOptionElement.cpp
content/html/content/src/HTMLOptionsCollection.cpp
content/html/content/src/HTMLOutputElement.cpp
content/html/content/src/HTMLParagraphElement.cpp
content/html/content/src/HTMLPreElement.cpp
content/html/content/src/HTMLPropertiesCollection.cpp
content/html/content/src/HTMLScriptElement.cpp
content/html/content/src/HTMLSelectElement.cpp
content/html/content/src/HTMLSharedObjectElement.cpp
content/html/content/src/HTMLSourceElement.cpp
content/html/content/src/HTMLStyleElement.cpp
content/html/content/src/HTMLTableCaptionElement.cpp
content/html/content/src/HTMLTableCellElement.cpp
content/html/content/src/HTMLTableElement.cpp
content/html/content/src/HTMLTextAreaElement.cpp
content/html/content/src/HTMLTitleElement.cpp
content/html/content/src/HTMLVideoElement.cpp
content/html/content/src/TimeRanges.cpp
content/html/content/src/UndoManager.cpp
content/html/content/src/nsGenericHTMLElement.cpp
content/html/content/src/nsGenericHTMLFrameElement.cpp
content/html/content/src/nsHTMLDNSPrefetch.cpp
content/html/content/src/nsRadioVisitor.cpp
content/html/content/src/nsTextEditorState.cpp
content/html/document/src/ImageDocument.cpp
content/html/document/src/MediaDocument.cpp
content/html/document/src/PluginDocument.cpp
content/html/document/src/nsHTMLDocument.cpp
content/mathml/content/src/nsMathMLElement.cpp
content/media/DOMMediaStream.cpp
content/media/Latency.cpp
content/media/MediaCache.cpp
content/media/MediaDecoder.cpp
content/media/MediaDecoderStateMachine.cpp
content/media/MediaRecorder.cpp
content/media/MediaResource.cpp
content/media/MediaShutdownManager.cpp
content/media/MediaStreamGraph.cpp
content/media/RtspMediaResource.cpp
content/media/SharedThreadPool.cpp
content/media/plugins/MediaResourceServer.cpp
content/media/webrtc/LoadMonitor.cpp
content/media/webrtc/MediaEngineDefault.cpp
content/media/webrtc/MediaEngineTabVideoSource.cpp
content/media/webrtc/MediaEngineWebRTCVideo.cpp
content/media/webspeech/recognition/SpeechRecognition.cpp
content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp
content/media/webspeech/synth/nsSynthVoiceRegistry.cpp
content/media/webspeech/synth/pico/nsPicoService.cpp
content/svg/content/src/SVGAElement.cpp
content/svg/content/src/SVGFEImageElement.cpp
content/svg/content/src/SVGImageElement.cpp
content/svg/content/src/SVGMPathElement.cpp
content/svg/content/src/SVGSVGElement.cpp
content/svg/content/src/SVGScriptElement.cpp
content/svg/content/src/SVGStyleElement.cpp
content/svg/content/src/SVGSymbolElement.cpp
content/svg/content/src/SVGTitleElement.cpp
content/svg/content/src/SVGUseElement.cpp
content/svg/content/src/nsSVGElement.cpp
content/xml/content/src/CDATASection.cpp
content/xml/content/src/ProcessingInstruction.cpp
content/xml/content/src/XMLStylesheetProcessingInstruction.cpp
content/xml/content/src/nsXMLElement.cpp
content/xml/document/src/XMLDocument.cpp
content/xml/document/src/nsXMLPrettyPrinter.cpp
content/xul/content/src/nsXULElement.cpp
content/xul/document/src/XULDocument.cpp
content/xul/document/src/nsXULPrototypeCache.cpp
content/xul/templates/src/nsXULSortService.cpp
content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp
content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp
content/xul/templates/src/nsXULTemplateResultSetRDF.cpp
content/xul/templates/src/nsXULTemplateResultStorage.cpp
content/xul/templates/src/nsXULTemplateResultXML.cpp
docshell/base/LoadContext.cpp
docshell/base/nsAboutRedirector.cpp
docshell/base/nsDefaultURIFixup.cpp
docshell/base/nsDocShell.cpp
docshell/base/nsDocShellEnumerator.cpp
docshell/base/nsDocShellTransferableHooks.cpp
docshell/base/nsDownloadHistory.cpp
docshell/base/nsWebNavigationInfo.cpp
docshell/shistory/src/nsSHEntry.cpp
docshell/shistory/src/nsSHEntryShared.cpp
docshell/shistory/src/nsSHistory.cpp
dom/alarm/AlarmHalService.cpp
dom/audiochannel/AudioChannelService.cpp
dom/audiochannel/tests/TestAudioChannelService.cpp
dom/base/CompositionStringSynthesizer.cpp
dom/base/DOMException.cpp
dom/base/DOMRequest.cpp
dom/base/Navigator.cpp
dom/base/nsContentPermissionHelper.cpp
dom/base/nsGlobalWindow.cpp
dom/base/nsGlobalWindowCommands.cpp
dom/base/nsIDOMClassInfo.h
dom/base/nsJSEnvironment.cpp
dom/base/nsScreen.cpp
dom/base/nsScriptNameSpaceManager.cpp
dom/base/nsWindowMemoryReporter.cpp
dom/bluetooth/BluetoothHidManager.cpp
dom/bluetooth/BluetoothProfileController.cpp
dom/bluetooth/BluetoothRilListener.cpp
dom/bluetooth/BluetoothService.cpp
dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
dom/bluetooth/bluedroid/BluetoothOppManager.cpp
dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp
dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
dom/bluetooth/bluez/BluetoothA2dpManager.cpp
dom/bluetooth/bluez/BluetoothHfpManager.cpp
dom/bluetooth/bluez/BluetoothOppManager.cpp
dom/camera/DOMCameraControl.cpp
dom/cellbroadcast/src/CellBroadcast.cpp
dom/devicestorage/nsDeviceStorage.cpp
dom/events/EventListenerService.cpp
dom/events/EventStateManager.cpp
dom/events/FocusEvent.cpp
dom/events/PaintRequest.cpp
dom/file/ArchiveZipFile.cpp
dom/file/AsyncHelper.cpp
dom/file/FileHelper.cpp
dom/file/FileService.cpp
dom/file/FileStreamWrappers.cpp
dom/file/LockedFile.cpp
dom/file/MemoryStreams.cpp
dom/filesystem/FileSystemPermissionRequest.cpp
dom/fmradio/FMRadioService.cpp
dom/gamepad/GamepadService.cpp
dom/icc/src/IccListener.cpp
dom/indexedDB/AsyncConnectionHelper.cpp
dom/indexedDB/CheckPermissionsHelper.cpp
dom/indexedDB/FileInfo.cpp
dom/indexedDB/IDBTransaction.cpp
dom/indexedDB/IndexedDatabaseManager.cpp
dom/indexedDB/OpenDatabaseHelper.cpp
dom/indexedDB/TransactionThreadPool.cpp
dom/indexedDB/ipc/IndexedDBParent.cpp
dom/ipc/Blob.cpp
dom/ipc/ColorPickerParent.cpp
dom/ipc/ContentChild.cpp
dom/ipc/ContentParent.cpp
dom/ipc/FilePickerParent.cpp
dom/ipc/PreallocatedProcessManager.cpp
dom/ipc/ProcessPriorityManager.cpp
dom/ipc/TabChild.cpp
dom/ipc/TabParent.cpp
dom/media/MediaManager.cpp
dom/media/MediaPermissionGonk.cpp
dom/mobileconnection/src/MobileConnection.cpp
dom/mobilemessage/src/MobileMessageService.cpp
dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp
dom/mobilemessage/src/android/SmsService.cpp
dom/mobilemessage/src/gonk/SmsService.cpp
dom/mobilemessage/src/ipc/SmsChild.cpp
dom/mobilemessage/src/ipc/SmsIPCService.cpp
dom/mobilemessage/src/ipc/SmsParent.cpp
dom/network/src/Connection.cpp
dom/network/src/UDPSocketChild.cpp
dom/network/src/UDPSocketParent.cpp
dom/plugins/base/nsNPAPIPluginStreamListener.cpp
dom/plugins/base/nsPluginDirServiceProvider.cpp
dom/plugins/base/nsPluginHost.cpp
dom/plugins/base/nsPluginInstanceOwner.cpp
dom/plugins/base/nsPluginPlayPreviewInfo.cpp
dom/plugins/base/nsPluginStreamListenerPeer.cpp
dom/plugins/base/nsPluginTags.cpp
dom/plugins/ipc/PluginModuleParent.cpp
dom/power/PowerManagerService.cpp
dom/quota/CheckQuotaHelper.cpp
dom/quota/QuotaManager.cpp
dom/smil/nsSMILTimeValueSpec.cpp
dom/speakermanager/SpeakerManager.cpp
dom/speakermanager/SpeakerManagerService.cpp
dom/src/geolocation/nsGeolocation.cpp
dom/src/jsurl/nsJSProtocolHandler.cpp
dom/src/notification/DesktopNotification.cpp
dom/src/notification/Notification.cpp
dom/src/storage/DOMStorageCache.cpp
dom/src/storage/DOMStorageDBThread.cpp
dom/src/storage/DOMStorageManager.cpp
dom/src/storage/DOMStorageObserver.cpp
dom/system/OSFileConstants.cpp
dom/system/android/AndroidLocationProvider.cpp
dom/system/android/nsHapticFeedback.cpp
dom/system/gonk/AudioChannelManager.cpp
dom/system/gonk/AudioManager.cpp
dom/system/gonk/AutoMounterSetting.cpp
dom/system/gonk/GonkGPSGeolocationProvider.cpp
dom/system/gonk/NetworkWorker.cpp
dom/system/gonk/SystemWorkerManager.cpp
dom/system/gonk/TimeZoneSettingObserver.cpp
dom/system/gonk/VolumeServiceTest.cpp
dom/system/gonk/nsVolume.cpp
dom/system/gonk/nsVolumeMountLock.cpp
dom/system/gonk/nsVolumeService.cpp
dom/system/gonk/nsVolumeStat.cpp
dom/system/mac/CoreLocationLocationProvider.mm
dom/system/nsDeviceSensors.cpp
dom/system/qt/QTMLocationProvider.cpp
dom/system/qt/QtHapticFeedback.cpp
dom/system/windows/nsHapticFeedback.cpp
dom/telephony/Telephony.cpp
dom/telephony/ipc/TelephonyIPCProvider.cpp
dom/telephony/ipc/TelephonyParent.cpp
dom/time/TimeService.cpp
dom/voicemail/Voicemail.cpp
dom/wifi/WifiProxyService.cpp
dom/workers/RuntimeService.cpp
dom/workers/ScriptLoader.cpp
dom/workers/WorkerPrivate.cpp
dom/workers/XMLHttpRequest.cpp
dom/xbl/XBLChildrenElement.cpp
dom/xbl/nsXBLEventHandler.cpp
dom/xbl/nsXBLService.cpp
dom/xbl/nsXBLWindowKeyHandler.cpp
dom/xslt/xpath/XPathEvaluator.cpp
dom/xslt/xpath/txNodeSetAdaptor.cpp
dom/xslt/xpath/txXPCOMExtensionFunction.cpp
dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
dom/xslt/xslt/txMozillaXMLOutput.cpp
editor/composer/src/nsComposeTxtSrvFilter.cpp
editor/composer/src/nsComposerCommands.cpp
editor/composer/src/nsComposerCommandsUpdater.cpp
editor/composer/src/nsEditingSession.cpp
editor/composer/src/nsEditorSpellCheck.cpp
editor/libeditor/base/nsEditorCommands.cpp
editor/libeditor/base/nsEditorEventListener.cpp
editor/libeditor/html/nsHTMLAnonymousUtils.cpp
editor/libeditor/html/nsHTMLEditRules.cpp
editor/libeditor/html/nsHTMLObjectResizer.cpp
editor/libeditor/html/nsHTMLURIRefObject.cpp
editor/txmgr/src/nsTransactionList.cpp
editor/txmgr/tests/TestTXMgr.cpp
embedding/browser/webBrowser/nsContextMenuInfo.cpp
embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp
embedding/components/appstartup/src/nsAppStartupNotifier.cpp
embedding/components/commandhandler/src/nsCommandGroup.cpp
embedding/components/commandhandler/src/nsCommandParams.cpp
embedding/components/commandhandler/src/nsControllerCommandTable.cpp
embedding/components/find/src/nsWebBrowserFind.cpp
embedding/components/printingui/src/mac/nsPrintProgressParams.cpp
embedding/components/printingui/src/mac/nsPrintingPromptServiceX.mm
embedding/components/printingui/src/unixshared/nsPrintProgressParams.cpp
embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
embedding/components/printingui/src/win/nsPrintProgressParams.cpp
embedding/components/printingui/src/win/nsPrintingPromptService.cpp
embedding/components/windowwatcher/src/nsDialogParamBlock.cpp
embedding/components/windowwatcher/src/nsWindowWatcher.cpp
embedding/tests/winEmbed/WindowCreator.cpp
extensions/auth/nsAuthGSSAPI.cpp
extensions/auth/nsAuthSASL.cpp
extensions/auth/nsAuthSSPI.cpp
extensions/auth/nsAuthSambaNTLM.cpp
extensions/auth/nsHttpNegotiateAuth.cpp
extensions/cookie/nsCookiePermission.cpp
extensions/cookie/nsCookiePromptService.cpp
extensions/cookie/nsPermission.cpp
extensions/cookie/nsPermissionManager.cpp
extensions/cookie/nsPopupWindowManager.cpp
extensions/gio/nsGIOProtocolHandler.cpp
extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
extensions/permissions/nsContentBlocker.cpp
extensions/pref/autoconfig/src/nsAutoConfig.cpp
extensions/pref/autoconfig/src/nsReadConfig.cpp
extensions/spellcheck/hunspell/src/mozHunspellDirProvider.cpp
extensions/spellcheck/src/mozGenericWordUtils.cpp
extensions/spellcheck/src/mozInlineSpellChecker.cpp
extensions/spellcheck/src/mozSpellI18NManager.cpp
extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp
gfx/gl/GfxTexturesReporter.cpp
gfx/layers/LayerScope.cpp
gfx/layers/d3d10/ReadbackManagerD3D10.cpp
gfx/layers/ipc/ISurfaceAllocator.cpp
gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
gfx/src/gfxCrashReporterUtils.cpp
gfx/src/nsDeviceContext.cpp
gfx/src/nsScriptableRegion.cpp
gfx/src/nsThebesFontEnumerator.cpp
gfx/thebes/gfxASurface.cpp
gfx/thebes/gfxAndroidPlatform.cpp
gfx/thebes/gfxFont.cpp
gfx/thebes/gfxFontInfoLoader.cpp
gfx/thebes/gfxPlatform.cpp
gfx/thebes/gfxPlatformFontList.cpp
gfx/thebes/gfxUserFontSet.cpp
gfx/thebes/gfxWindowsPlatform.cpp
hal/HalWakeLock.cpp
hal/cocoa/CocoaBattery.cpp
hal/gonk/GonkHal.cpp
hal/windows/WindowsGamepad.cpp
image/decoders/icon/android/nsIconChannel.cpp
image/decoders/icon/gtk/nsIconChannel.cpp
image/decoders/icon/mac/nsIconChannelCocoa.mm
image/decoders/icon/nsIconProtocolHandler.cpp
image/decoders/icon/nsIconURI.cpp
image/decoders/icon/qt/nsIconChannel.cpp
image/decoders/icon/win/nsIconChannel.cpp
image/encoders/bmp/nsBMPEncoder.cpp
image/encoders/ico/nsICOEncoder.cpp
image/encoders/jpeg/nsJPEGEncoder.cpp
image/encoders/png/nsPNGEncoder.cpp
image/src/ClippedImage.cpp
image/src/FrozenImage.cpp
image/src/ImageWrapper.cpp
image/src/OrientedImage.cpp
image/src/RasterImage.cpp
image/src/SVGDocumentWrapper.cpp
image/src/SurfaceCache.cpp
image/src/VectorImage.cpp
image/src/imgLoader.cpp
image/src/imgRequest.cpp
image/src/imgTools.cpp
intl/chardet/src/nsCyrillicDetector.cpp
intl/hyphenation/src/nsHyphenationManager.cpp
intl/locale/src/mac/nsCollationMacUC.cpp
intl/locale/src/mac/nsDateTimeFormatMac.cpp
intl/locale/src/mac/nsMacCharset.cpp
intl/locale/src/nsCollation.cpp
intl/locale/src/nsLanguageAtomService.cpp
intl/locale/src/nsLocale.cpp
intl/locale/src/nsLocaleService.cpp
intl/locale/src/nsScriptableDateFormat.cpp
intl/locale/src/unix/nsAndroidCharset.cpp
intl/locale/src/unix/nsCollationUnix.cpp
intl/locale/src/unix/nsDateTimeFormatUnix.cpp
intl/locale/src/unix/nsUNIXCharset.cpp
intl/locale/src/windows/nsCollationWin.cpp
intl/locale/src/windows/nsDateTimeFormatWin.cpp
intl/locale/src/windows/nsWinCharset.cpp
intl/lwbrk/src/nsJISx4051LineBreaker.cpp
intl/lwbrk/src/nsSampleWordBreaker.cpp
intl/lwbrk/src/nsSemanticUnitScanner.cpp
intl/strres/src/nsStringBundle.cpp
intl/strres/src/nsStringBundleTextOverride.cpp
intl/uconv/src/nsCharsetConverterManager.cpp
intl/uconv/src/nsConverterInputStream.cpp
intl/uconv/src/nsConverterOutputStream.cpp
intl/uconv/src/nsScriptableUConv.cpp
intl/uconv/src/nsTextToSubURI.cpp
intl/uconv/src/nsUTF8ConverterService.cpp
intl/uconv/src/nsUnicodeToUTF8.cpp
intl/uconv/util/nsUCSupport.cpp
intl/unicharutil/src/nsCaseConversionImp2.cpp
intl/unicharutil/src/nsCategoryImp.cpp
intl/unicharutil/src/nsEntityConverter.cpp
intl/unicharutil/src/nsSaveAsCharset.cpp
intl/unicharutil/src/nsUnicodeNormalizer.cpp
ipc/glue/BackgroundImpl.cpp
ipc/glue/FileDescriptorUtils.cpp
ipc/glue/MessagePump.cpp
ipc/glue/SharedMemory.cpp
ipc/testshell/XPCShellEnvironment.cpp
js/ductwork/debugger/JSDebugger.cpp
js/jsd/jsd_xpc.cpp
js/xpconnect/loader/mozJSComponentLoader.cpp
js/xpconnect/loader/mozJSSubScriptLoader.cpp
js/xpconnect/src/Sandbox.cpp
js/xpconnect/src/XPCComponents.cpp
js/xpconnect/src/XPCJSID.cpp
js/xpconnect/src/XPCJSRuntime.cpp
js/xpconnect/src/XPCJSWeakReference.cpp
js/xpconnect/src/XPCShellImpl.cpp
js/xpconnect/src/XPCVariant.cpp
js/xpconnect/src/XPCWrappedJSClass.cpp
js/xpconnect/src/XPCWrappedNative.cpp
js/xpconnect/src/nsScriptError.cpp
js/xpconnect/src/nsXPConnect.cpp
js/xpconnect/tests/components/native/xpctest_attributes.cpp
js/xpconnect/tests/components/native/xpctest_params.cpp
layout/base/nsCaret.cpp
layout/base/nsDocumentViewer.cpp
layout/base/nsFrameTraversal.cpp
layout/base/nsLayoutDebugger.cpp
layout/base/nsLayoutHistoryState.cpp
layout/base/nsPresShell.cpp
layout/base/nsRefreshDriver.cpp
layout/base/nsStyleSheetService.cpp
layout/build/nsContentDLF.cpp
layout/forms/nsComboboxControlFrame.cpp
layout/forms/nsFileControlFrame.cpp
layout/forms/nsListControlFrame.cpp
layout/generic/ScrollbarActivity.cpp
layout/generic/nsBulletFrame.cpp
layout/generic/nsFrameUtil.cpp
layout/generic/nsImageFrame.cpp
layout/generic/nsImageMap.cpp
layout/generic/nsSelection.cpp
layout/inspector/inCSSValueSearch.cpp
layout/inspector/inDOMUtils.cpp
layout/inspector/inDOMView.cpp
layout/inspector/inDeepTreeWalker.cpp
layout/inspector/inFlasher.cpp
layout/inspector/nsFontFace.cpp
layout/inspector/nsFontFaceList.cpp
layout/mathml/nsMathMLChar.cpp
layout/mathml/nsMathMLmactionFrame.cpp
layout/printing/nsPagePrintTimer.cpp
layout/printing/nsPrintEngine.cpp
layout/printing/nsPrintPreviewListener.cpp
layout/style/AnimationCommon.cpp
layout/style/Loader.cpp
layout/style/StyleRule.cpp
layout/style/nsCSSRuleProcessor.cpp
layout/style/nsDOMCSSDeclaration.cpp
layout/style/nsFontFaceLoader.cpp
layout/style/nsHTMLCSSStyleSheet.cpp
layout/style/nsHTMLStyleSheet.cpp
layout/style/nsLayoutStylesheetCache.cpp
layout/style/nsStyleSet.cpp
layout/svg/SVGTextFrame.cpp
layout/svg/nsSVGEffects.cpp
layout/svg/nsSVGImageFrame.cpp
layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp
layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp
layout/tools/layout-debug/src/nsRegressionTester.cpp
layout/xul/nsBoxLayout.cpp
layout/xul/nsImageBoxFrame.cpp
layout/xul/nsListBoxBodyFrame.cpp
layout/xul/nsListBoxObject.cpp
layout/xul/nsMenuBarListener.cpp
layout/xul/nsMenuBoxObject.cpp
layout/xul/nsMenuFrame.cpp
layout/xul/nsPopupBoxObject.cpp
layout/xul/nsRepeatService.cpp
layout/xul/nsSliderFrame.cpp
layout/xul/nsSplitterFrame.cpp
layout/xul/nsXULPopupManager.cpp
layout/xul/nsXULTooltipListener.cpp
layout/xul/tree/nsTreeImageListener.cpp
media/mtransport/nr_socket_prsock.cpp
media/mtransport/nr_timer.cpp
media/mtransport/nriceresolver.cpp
media/mtransport/stun_udp_socket_filter.cpp
media/mtransport/test/sctp_unittest.cpp
media/mtransport/transportlayerloopback.cpp
media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
media/webrtc/signaling/test/FakeMediaStreamsImpl.h
media/webrtc/signaling/test/signaling_unittests.cpp
mobile/android/components/build/nsAndroidHistory.cpp
mobile/android/components/build/nsShellService.cpp
modules/libjar/nsJAR.cpp
modules/libjar/nsJARChannel.cpp
modules/libjar/nsJARInputStream.cpp
modules/libjar/nsJARProtocolHandler.cpp
modules/libjar/zipwriter/src/nsDeflateConverter.cpp
modules/libjar/zipwriter/src/nsZipDataStream.cpp
modules/libjar/zipwriter/src/nsZipHeader.cpp
modules/libjar/zipwriter/src/nsZipWriter.cpp
modules/libpref/src/Preferences.cpp
modules/libpref/src/nsPrefBranch.cpp
netwerk/base/src/ArrayBufferInputStream.cpp
netwerk/base/src/BackgroundFileSaver.cpp
netwerk/base/src/Dashboard.cpp
netwerk/base/src/EventTokenBucket.cpp
netwerk/base/src/LoadContextInfo.cpp
netwerk/base/src/ProxyAutoConfig.cpp
netwerk/base/src/RedirectChannelRegistrar.cpp
netwerk/base/src/Seer.cpp
netwerk/base/src/StreamingProtocolService.cpp
netwerk/base/src/Tickler.cpp
netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp
netwerk/base/src/nsAuthInformationHolder.cpp
netwerk/base/src/nsBase64Encoder.cpp
netwerk/base/src/nsBaseChannel.cpp
netwerk/base/src/nsBufferedStreams.cpp
netwerk/base/src/nsChannelClassifier.cpp
netwerk/base/src/nsDNSPrefetch.cpp
netwerk/base/src/nsDirectoryIndexStream.cpp
netwerk/base/src/nsDownloader.cpp
netwerk/base/src/nsFileStreams.cpp
netwerk/base/src/nsIOService.cpp
netwerk/base/src/nsIncrementalDownload.cpp
netwerk/base/src/nsInputStreamChannel.cpp
netwerk/base/src/nsInputStreamPump.cpp
netwerk/base/src/nsLoadGroup.cpp
netwerk/base/src/nsMIMEInputStream.cpp
netwerk/base/src/nsNetAddr.cpp
netwerk/base/src/nsPACMan.cpp
netwerk/base/src/nsPreloadedStream.cpp
netwerk/base/src/nsProtocolProxyService.cpp
netwerk/base/src/nsProxyInfo.cpp
netwerk/base/src/nsRequestObserverProxy.cpp
netwerk/base/src/nsSerializationHelper.cpp
netwerk/base/src/nsServerSocket.cpp
netwerk/base/src/nsSimpleNestedURI.cpp
netwerk/base/src/nsSimpleStreamListener.cpp
netwerk/base/src/nsSimpleURI.cpp
netwerk/base/src/nsSocketTransport2.cpp
netwerk/base/src/nsSocketTransportService2.cpp
netwerk/base/src/nsStandardURL.cpp
netwerk/base/src/nsStreamListenerTee.cpp
netwerk/base/src/nsStreamListenerWrapper.cpp
netwerk/base/src/nsStreamLoader.cpp
netwerk/base/src/nsStreamTransportService.cpp
netwerk/base/src/nsSyncStreamListener.cpp
netwerk/base/src/nsTemporaryFileInputStream.cpp
netwerk/base/src/nsTransportUtils.cpp
netwerk/base/src/nsUDPSocket.cpp
netwerk/base/src/nsURIChecker.cpp
netwerk/base/src/nsURLParsers.cpp
netwerk/base/src/nsUnicharStreamLoader.cpp
netwerk/cache/nsApplicationCacheService.cpp
netwerk/cache/nsCacheEntry.cpp
netwerk/cache/nsCacheEntryDescriptor.cpp
netwerk/cache/nsCacheService.cpp
netwerk/cache/nsCacheSession.cpp
netwerk/cache/nsDiskCacheDevice.cpp
netwerk/cache/nsDiskCacheDeviceSQL.cpp
netwerk/cache/nsDiskCacheEntry.cpp
netwerk/cache/nsDiskCacheStreams.cpp
netwerk/cache/nsMemoryCacheDevice.cpp
netwerk/cache2/CacheEntry.cpp
netwerk/cache2/CacheFile.cpp
netwerk/cache2/CacheFileIOManager.cpp
netwerk/cache2/CacheFileMetadata.cpp
netwerk/cache2/CacheIOThread.cpp
netwerk/cache2/CacheIndex.cpp
netwerk/cache2/CacheObserver.cpp
netwerk/cache2/CacheStorage.cpp
netwerk/cache2/CacheStorageService.cpp
netwerk/cache2/OldWrappers.cpp
netwerk/cookie/CookieServiceChild.cpp
netwerk/cookie/nsCookie.cpp
netwerk/cookie/nsCookieService.cpp
netwerk/dns/ChildDNSService.cpp
netwerk/dns/DNSListenerProxy.cpp
netwerk/dns/DNSRequestChild.cpp
netwerk/dns/DNSRequestParent.cpp
netwerk/dns/nsDNSService2.cpp
netwerk/dns/nsEffectiveTLDService.cpp
netwerk/dns/nsIDNService.cpp
netwerk/ipc/RemoteOpenFileChild.cpp
netwerk/mime/nsMIMEHeaderParamImpl.cpp
netwerk/protocol/about/nsAboutBlank.cpp
netwerk/protocol/about/nsAboutBloat.cpp
netwerk/protocol/about/nsAboutCache.cpp
netwerk/protocol/about/nsAboutCacheEntry.cpp
netwerk/protocol/about/nsAboutProtocolHandler.cpp
netwerk/protocol/app/AppProtocolHandler.cpp
netwerk/protocol/data/nsDataHandler.cpp
netwerk/protocol/device/AndroidCaptureProvider.cpp
netwerk/protocol/device/nsDeviceChannel.cpp
netwerk/protocol/device/nsDeviceProtocolHandler.cpp
netwerk/protocol/file/nsFileChannel.cpp
netwerk/protocol/file/nsFileProtocolHandler.cpp
netwerk/protocol/ftp/FTPChannelChild.cpp
netwerk/protocol/ftp/FTPChannelParent.cpp
netwerk/protocol/ftp/nsFTPChannel.cpp
netwerk/protocol/ftp/nsFtpConnectionThread.cpp
netwerk/protocol/ftp/nsFtpControlConnection.cpp
netwerk/protocol/ftp/nsFtpProtocolHandler.cpp
netwerk/protocol/http/HttpBaseChannel.cpp
netwerk/protocol/http/HttpChannelParent.cpp
netwerk/protocol/http/HttpChannelParentListener.cpp
netwerk/protocol/http/SpdyZlibReporter.cpp
netwerk/protocol/http/nsHttpActivityDistributor.cpp
netwerk/protocol/http/nsHttpAuthCache.cpp
netwerk/protocol/http/nsHttpAuthManager.cpp
netwerk/protocol/http/nsHttpBasicAuth.cpp
netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
netwerk/protocol/http/nsHttpConnection.cpp
netwerk/protocol/http/nsHttpConnectionMgr.cpp
netwerk/protocol/http/nsHttpDigestAuth.cpp
netwerk/protocol/http/nsHttpHandler.cpp
netwerk/protocol/http/nsHttpNTLMAuth.cpp
netwerk/protocol/http/nsHttpTransaction.cpp
netwerk/protocol/res/nsResProtocolHandler.cpp
netwerk/protocol/rtsp/RtspChannelChild.cpp
netwerk/protocol/rtsp/RtspChannelParent.cpp
netwerk/protocol/rtsp/RtspHandler.cpp
netwerk/protocol/rtsp/controller/RtspController.cpp
netwerk/protocol/rtsp/controller/RtspControllerParent.cpp
netwerk/protocol/rtsp/controller/RtspMetaData.cpp
netwerk/protocol/viewsource/nsViewSourceHandler.cpp
netwerk/protocol/websocket/WebSocketChannel.cpp
netwerk/protocol/websocket/WebSocketChannelParent.cpp
netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
netwerk/sctp/datachannel/DataChannel.cpp
netwerk/socket/nsSOCKSIOLayer.cpp
netwerk/socket/nsSOCKSSocketProvider.cpp
netwerk/socket/nsSocketProviderService.cpp
netwerk/socket/nsUDPSocketProvider.cpp
netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
netwerk/streamconv/converters/nsDirIndex.cpp
netwerk/streamconv/converters/nsDirIndexParser.cpp
netwerk/streamconv/converters/nsFTPDirListingConv.cpp
netwerk/streamconv/converters/nsHTTPCompressConv.cpp
netwerk/streamconv/converters/nsIndexedToHTML.cpp
netwerk/streamconv/converters/nsMultiMixedConv.cpp
netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
netwerk/streamconv/src/nsStreamConverterService.cpp
netwerk/streamconv/test/Converters.cpp
netwerk/streamconv/test/TestStreamConv.cpp
netwerk/system/android/nsAndroidNetworkLinkService.cpp
netwerk/system/mac/nsNetworkLinkService.mm
netwerk/system/qt/nsQtNetworkLinkService.cpp
netwerk/system/win32/nsNotifyAddrListener.cpp
netwerk/test/TestCallbacks.cpp
netwerk/test/TestCommon.h
netwerk/test/TestDNS.cpp
netwerk/test/TestFileInput2.cpp
netwerk/test/TestHttp.cpp
netwerk/test/TestIOThreads.cpp
netwerk/test/TestIncrementalDownload.cpp
netwerk/test/TestMCTransport.cpp
netwerk/test/TestOverlappedIO.cpp
netwerk/test/TestPageLoad.cpp
netwerk/test/TestPerf.cpp
netwerk/test/TestProtocols.cpp
netwerk/test/TestRes.cpp
netwerk/test/TestServ.cpp
netwerk/test/TestSocketIO.cpp
netwerk/test/TestSocketInput.cpp
netwerk/test/TestSocketTransport.cpp
netwerk/test/TestStreamChannel.cpp
netwerk/test/TestStreamLoader.cpp
netwerk/test/TestStreamPump.cpp
netwerk/test/TestStreamTransport.cpp
netwerk/test/TestThreadedIO.cpp
netwerk/test/TestUDPSocket.cpp
netwerk/test/TestUpload.cpp
netwerk/wifi/nsWifiAccessPoint.cpp
netwerk/wifi/nsWifiMonitor.cpp
netwerk/wifi/nsWifiMonitorGonk.cpp
parser/html/nsHtml5Module.cpp
parser/html/nsHtml5Parser.cpp
parser/html/nsHtml5StreamParser.cpp
parser/html/nsHtml5TreeOpExecutor.cpp
parser/html/nsParserUtils.cpp
parser/htmlparser/src/CNavDTD.cpp
parser/htmlparser/src/nsHTMLTokenizer.cpp
parser/htmlparser/src/nsParserService.cpp
parser/xml/src/nsSAXAttributes.cpp
parser/xml/src/nsSAXLocator.cpp
profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp
rdf/base/src/nsCompositeDataSource.cpp
rdf/base/src/nsContainerEnumerator.cpp
rdf/base/src/nsInMemoryDataSource.cpp
rdf/base/src/nsRDFContainer.cpp
rdf/base/src/nsRDFContainerUtils.cpp
rdf/base/src/nsRDFService.cpp
rdf/base/src/nsRDFXMLParser.cpp
rdf/base/src/nsRDFXMLSerializer.cpp
rdf/base/src/rdfTriplesSerializer.cpp
rdf/datasource/src/nsFileSystemDataSource.cpp
rdf/tests/rdfcat/rdfcat.cpp
rdf/tests/rdfpoll/rdfpoll.cpp
rdf/tests/triplescat/triplescat.cpp
rdf/util/src/nsRDFResource.cpp
security/manager/boot/src/nsEntropyCollector.cpp
security/manager/boot/src/nsSecureBrowserUIImpl.cpp
security/manager/boot/src/nsSecurityWarningDialogs.cpp
security/manager/boot/src/nsSiteSecurityService.cpp
security/manager/pki/src/nsASN1Tree.cpp
security/manager/pki/src/nsFormSigningDialog.cpp
security/manager/pki/src/nsNSSDialogs.cpp
security/manager/pki/src/nsPKIParamBlock.cpp
security/manager/ssl/src/NSSErrorsService.cpp
security/manager/ssl/src/PSMContentListener.cpp
security/manager/ssl/src/SharedSSLState.cpp
security/manager/ssl/src/TransportSecurityInfo.cpp
security/manager/ssl/src/nsCMS.cpp
security/manager/ssl/src/nsCMSSecureMessage.cpp
security/manager/ssl/src/nsCertOverrideService.cpp
security/manager/ssl/src/nsCertPicker.cpp
security/manager/ssl/src/nsCertTree.cpp
security/manager/ssl/src/nsCertVerificationThread.cpp
security/manager/ssl/src/nsCertificatePrincipal.cpp
security/manager/ssl/src/nsClientAuthRemember.cpp
security/manager/ssl/src/nsCrypto.cpp
security/manager/ssl/src/nsCryptoHash.cpp
security/manager/ssl/src/nsDataSignatureVerifier.cpp
security/manager/ssl/src/nsKeyModule.cpp
security/manager/ssl/src/nsKeygenHandler.cpp
security/manager/ssl/src/nsKeygenThread.cpp
security/manager/ssl/src/nsNSSASN1Object.cpp
security/manager/ssl/src/nsNSSCallbacks.cpp
security/manager/ssl/src/nsNSSCertCache.cpp
security/manager/ssl/src/nsNSSCertValidity.cpp
security/manager/ssl/src/nsNSSCertificate.cpp
security/manager/ssl/src/nsNSSCertificateDB.cpp
security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp
security/manager/ssl/src/nsNSSComponent.cpp
security/manager/ssl/src/nsNSSIOLayer.cpp
security/manager/ssl/src/nsNSSVersion.cpp
security/manager/ssl/src/nsNTLMAuthModule.cpp
security/manager/ssl/src/nsPK11TokenDB.cpp
security/manager/ssl/src/nsPKCS11Slot.cpp
security/manager/ssl/src/nsProtectedAuthThread.cpp
security/manager/ssl/src/nsRandomGenerator.cpp
security/manager/ssl/src/nsRecentBadCerts.cpp
security/manager/ssl/src/nsSDR.cpp
security/manager/ssl/src/nsSSLSocketProvider.cpp
security/manager/ssl/src/nsSSLStatus.cpp
security/manager/ssl/src/nsStreamCipher.cpp
security/manager/ssl/src/nsTLSSocketProvider.cpp
services/crypto/component/nsSyncJPAKE.h
startupcache/StartupCache.cpp
storage/src/VacuumManager.cpp
storage/src/Variant_inl.h
storage/src/mozStorageArgValueArray.cpp
storage/src/mozStorageAsyncStatement.cpp
storage/src/mozStorageAsyncStatementExecution.cpp
storage/src/mozStorageAsyncStatementParams.cpp
storage/src/mozStorageBindingParams.cpp
storage/src/mozStorageBindingParamsArray.cpp
storage/src/mozStorageError.cpp
storage/src/mozStorageResultSet.cpp
storage/src/mozStorageRow.cpp
storage/src/mozStorageService.cpp
storage/src/mozStorageStatement.cpp
storage/src/mozStorageStatementParams.cpp
storage/src/mozStorageStatementRow.cpp
storage/style.txt
storage/test/storage_test_harness.h
storage/test/test_async_callbacks_with_spun_event_loops.cpp
toolkit/components/alerts/nsAlertsService.cpp
toolkit/components/alerts/nsXULAlerts.cpp
toolkit/components/autocomplete/nsAutoCompleteController.cpp
toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp
toolkit/components/commandlines/nsCommandLine.cpp
toolkit/components/ctypes/ctypes.cpp
toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp
toolkit/components/downloads/ApplicationReputation.cpp
toolkit/components/downloads/SQLFunctions.cpp
toolkit/components/downloads/nsDownloadManager.cpp
toolkit/components/downloads/nsDownloadProxy.h
toolkit/components/filepicker/nsFileView.cpp
toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
toolkit/components/find/nsFindService.cpp
toolkit/components/intl/nsCharsetMenu.cpp
toolkit/components/jsdownloads/src/DownloadPlatform.cpp
toolkit/components/mediasniffer/nsMediaSniffer.cpp
toolkit/components/osfile/NativeOSFileInternals.cpp
toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp
toolkit/components/perf/PerfMeasurement.cpp
toolkit/components/places/AsyncFaviconHelpers.cpp
toolkit/components/places/Database.cpp
toolkit/components/places/Helpers.cpp
toolkit/components/places/History.cpp
toolkit/components/places/PlaceInfo.cpp
toolkit/components/places/SQLFunctions.cpp
toolkit/components/places/VisitInfo.cpp
toolkit/components/places/nsAnnoProtocolHandler.cpp
toolkit/components/places/nsAnnotationService.cpp
toolkit/components/places/nsFaviconService.cpp
toolkit/components/places/nsNavBookmarks.cpp
toolkit/components/places/nsNavHistory.cpp
toolkit/components/places/nsNavHistoryQuery.cpp
toolkit/components/places/nsNavHistoryResult.cpp
toolkit/components/places/tests/cpp/mock_Link.h
toolkit/components/places/tests/cpp/places_test_harness.h
toolkit/components/places/tests/cpp/test_IHistory.cpp
toolkit/components/reflect/reflect.cpp
toolkit/components/remote/nsGTKRemoteService.cpp
toolkit/components/remote/nsQtRemoteService.cpp
toolkit/components/satchel/nsFormFillController.cpp
toolkit/components/startup/nsAppStartup.cpp
toolkit/components/startup/nsUserInfoMac.mm
toolkit/components/startup/nsUserInfoUnix.cpp
toolkit/components/startup/nsUserInfoWin.cpp
toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
toolkit/components/telemetry/Telemetry.cpp
toolkit/components/url-classifier/nsCheckSummedOutputStream.cpp
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
toolkit/components/url-classifier/nsUrlClassifierProxies.cpp
toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp
toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
toolkit/identity/IdentityCryptoService.cpp
toolkit/profile/nsToolkitProfileService.cpp
toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp
toolkit/system/dbus/nsDBusService.cpp
toolkit/system/dbus/nsNetworkManagerListener.cpp
toolkit/system/gnome/nsAlertsIconListener.cpp
toolkit/system/gnome/nsGConfService.cpp
toolkit/system/gnome/nsGIOService.cpp
toolkit/system/gnome/nsGSettingsService.cpp
toolkit/system/gnome/nsGnomeVFSService.cpp
toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
toolkit/system/unixproxy/nsLibProxySettings.cpp
toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
toolkit/xre/nsAppRunner.cpp
toolkit/xre/nsNativeAppSupportBase.cpp
toolkit/xre/nsUpdateDriver.cpp
toolkit/xre/nsXREDirProvider.cpp
tools/profiler/SaveProfileTask.cpp
tools/profiler/nsProfiler.cpp
uriloader/exthandler/ExternalHelperAppChild.cpp
uriloader/exthandler/ExternalHelperAppParent.cpp
uriloader/exthandler/android/nsAndroidHandlerApp.cpp
uriloader/exthandler/android/nsExternalSharingAppService.cpp
uriloader/exthandler/android/nsExternalURLHandlerService.cpp
uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
uriloader/exthandler/nsContentHandlerApp.cpp
uriloader/exthandler/nsDBusHandlerApp.cpp
uriloader/exthandler/nsExternalHelperAppService.cpp
uriloader/exthandler/nsLocalHandlerApp.cpp
uriloader/exthandler/unix/nsMeegoExternalSharingAppService.cpp
uriloader/exthandler/win/nsMIMEInfoWin.cpp
uriloader/prefetch/OfflineCacheUpdateGlue.cpp
uriloader/prefetch/OfflineCacheUpdateParent.cpp
uriloader/prefetch/nsOfflineCacheUpdate.cpp
uriloader/prefetch/nsOfflineCacheUpdateService.cpp
uriloader/prefetch/nsPrefetchService.cpp
widget/android/AndroidBridge.cpp
widget/android/AndroidJavaWrappers.cpp
widget/android/GfxInfo.cpp
widget/android/nsAppShell.cpp
widget/android/nsClipboard.cpp
widget/android/nsDeviceContextAndroid.cpp
widget/android/nsIMEPicker.cpp
widget/android/nsScreenManagerAndroid.cpp
widget/android/nsWindow.cpp
widget/cocoa/GfxInfo.mm
widget/cocoa/OSXNotificationCenter.mm
widget/cocoa/nsBidiKeyboard.mm
widget/cocoa/nsChildView.mm
widget/cocoa/nsCocoaWindow.mm
widget/cocoa/nsColorPicker.mm
widget/cocoa/nsDeviceContextSpecX.mm
widget/cocoa/nsFilePicker.mm
widget/cocoa/nsMacDockSupport.mm
widget/cocoa/nsMacWebAppUtils.mm
widget/cocoa/nsMenuBarX.mm
widget/cocoa/nsMenuGroupOwnerX.mm
widget/cocoa/nsMenuItemIconX.mm
widget/cocoa/nsNativeThemeCocoa.mm
widget/cocoa/nsPrintDialogX.mm
widget/cocoa/nsPrintSettingsX.mm
widget/cocoa/nsScreenManagerCocoa.mm
widget/cocoa/nsSound.mm
widget/cocoa/nsStandaloneNativeMenu.mm
widget/gonk/GonkMemoryPressureMonitoring.cpp
widget/gonk/nsAppShell.cpp
widget/gonk/nsClipboard.cpp
widget/gonk/nsWindow.cpp
widget/gtk/nsBidiKeyboard.cpp
widget/gtk/nsClipboard.cpp
widget/gtk/nsColorPicker.cpp
widget/gtk/nsDeviceContextSpecG.cpp
widget/gtk/nsDragService.cpp
widget/gtk/nsFilePicker.cpp
widget/gtk/nsImageToPixbuf.cpp
widget/gtk/nsNativeThemeGTK.cpp
widget/gtk/nsPrintDialogGTK.cpp
widget/gtk/nsPrintSettingsGTK.cpp
widget/gtk/nsScreenManagerGtk.cpp
widget/gtk/nsSound.cpp
widget/gtk/nsWindow.cpp
widget/qt/nsBidiKeyboard.cpp
widget/qt/nsClipboard.cpp
widget/qt/nsDeviceContextSpecQt.cpp
widget/qt/nsPrintDialogQt.cpp
widget/qt/nsPrintSettingsQt.cpp
widget/qt/nsScreenManagerQt.cpp
widget/qt/nsWindow.cpp
widget/tests/TestAppShellSteadyState.cpp
widget/tests/TestWinTSF.cpp
widget/windows/GfxInfo.cpp
widget/windows/JumpListBuilder.cpp
widget/windows/JumpListItem.cpp
widget/windows/LSPAnnotator.cpp
widget/windows/TaskbarPreviewButton.cpp
widget/windows/TaskbarTabPreview.cpp
widget/windows/TaskbarWindowPreview.cpp
widget/windows/WinTaskbar.cpp
widget/windows/WinUtils.cpp
widget/windows/nsAppShell.cpp
widget/windows/nsBidiKeyboard.cpp
widget/windows/nsClipboard.cpp
widget/windows/nsColorPicker.cpp
widget/windows/nsDataObj.cpp
widget/windows/nsDeviceContextSpecWin.cpp
widget/windows/nsFilePicker.cpp
widget/windows/nsNativeThemeWin.cpp
widget/windows/nsPrintSettingsWin.cpp
widget/windows/nsScreenManagerWin.cpp
widget/windows/nsSound.cpp
widget/windows/winrt/UIAAccessibilityBridge.cpp
widget/windows/winrt/WakeLockListener.cpp
widget/windows/winrt/nsMetroFilePicker.cpp
widget/windows/winrt/nsWinMetroUtils.cpp
widget/xpwidgets/GfxInfoBase.cpp
widget/xpwidgets/GfxInfoX11.cpp
widget/xpwidgets/PuppetWidget.cpp
widget/xpwidgets/nsBaseAppShell.cpp
widget/xpwidgets/nsBaseClipboard.cpp
widget/xpwidgets/nsBaseDragService.cpp
widget/xpwidgets/nsBaseFilePicker.cpp
widget/xpwidgets/nsBaseScreen.cpp
widget/xpwidgets/nsBaseWidget.cpp
widget/xpwidgets/nsClipboardHelper.cpp
widget/xpwidgets/nsClipboardPrivacyHandler.cpp
widget/xpwidgets/nsClipboardProxy.cpp
widget/xpwidgets/nsColorPickerProxy.cpp
widget/xpwidgets/nsFilePickerProxy.cpp
widget/xpwidgets/nsHTMLFormatConverter.cpp
widget/xpwidgets/nsIdleService.cpp
widget/xpwidgets/nsNativeTheme.cpp
widget/xpwidgets/nsPrintOptionsImpl.cpp
widget/xpwidgets/nsPrintSession.cpp
widget/xpwidgets/nsPrintSettingsImpl.cpp
widget/xpwidgets/nsTransferable.cpp
xpcom/base/AvailableMemoryTracker.cpp
xpcom/base/SystemMemoryReporter.cpp
xpcom/base/VisualEventTracer.cpp
xpcom/base/nsConsoleMessage.cpp
xpcom/base/nsConsoleService.cpp
xpcom/base/nsCycleCollector.cpp
xpcom/base/nsDebugImpl.cpp
xpcom/base/nsDumpUtils.cpp
xpcom/base/nsErrorService.cpp
xpcom/base/nsGZFileWriter.cpp
xpcom/base/nsIStatusReporter.idl
xpcom/base/nsInterfaceRequestorAgg.cpp
xpcom/base/nsMacUtilsImpl.cpp
xpcom/base/nsMemoryImpl.cpp
xpcom/base/nsMemoryInfoDumper.cpp
xpcom/base/nsMemoryReporterManager.cpp
xpcom/base/nsMessageLoop.cpp
xpcom/base/nsSecurityConsoleMessage.cpp
xpcom/base/nsStatusReporterManager.cpp
xpcom/base/nsUUIDGenerator.cpp
xpcom/base/nsVersionComparatorImpl.cpp
xpcom/build/nsXPComInit.cpp
xpcom/components/nsCategoryManager.cpp
xpcom/components/nsComponentManager.cpp
xpcom/components/nsNativeComponentLoader.cpp
xpcom/ds/nsAtomService.cpp
xpcom/ds/nsAtomTable.cpp
xpcom/ds/nsExpirationTracker.h
xpcom/ds/nsHashPropertyBag.cpp
xpcom/ds/nsINIParserImpl.cpp
xpcom/ds/nsObserverList.cpp
xpcom/ds/nsObserverService.cpp
xpcom/ds/nsPersistentProperties.cpp
xpcom/ds/nsStringEnumerator.cpp
xpcom/ds/nsSupportsArray.cpp
xpcom/ds/nsSupportsArrayEnumerator.cpp
xpcom/ds/nsSupportsPrimitives.cpp
xpcom/ds/nsVariant.cpp
xpcom/ds/nsWindowsRegKey.cpp
xpcom/glue/GenericFactory.cpp
xpcom/glue/GenericModule.cpp
xpcom/glue/nsArrayEnumerator.cpp
xpcom/glue/nsCategoryCache.cpp
xpcom/glue/nsClassInfoImpl.cpp
xpcom/glue/nsEnumeratorUtils.cpp
xpcom/glue/nsIClassInfoImpl.h
xpcom/glue/nsThreadUtils.cpp
xpcom/glue/nsWeakReference.cpp
xpcom/idl-parser/header.py
xpcom/io/nsAnonymousTemporaryFile.cpp
xpcom/io/nsAppFileLocationProvider.cpp
xpcom/io/nsBinaryStream.cpp
xpcom/io/nsDirectoryService.cpp
xpcom/io/nsIOUtil.cpp
xpcom/io/nsInputStreamTee.cpp
xpcom/io/nsLocalFileUnix.cpp
xpcom/io/nsLocalFileWin.cpp
xpcom/io/nsMultiplexInputStream.cpp
xpcom/io/nsPipe3.cpp
xpcom/io/nsScriptableBase64Encoder.cpp
xpcom/io/nsScriptableInputStream.cpp
xpcom/io/nsStorageStream.cpp
xpcom/io/nsStreamUtils.cpp
xpcom/io/nsStringStream.cpp
xpcom/io/nsUnicharInputStream.cpp
xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp
xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
xpcom/sample/nsSample.cpp
xpcom/sample/xpconnect-sample.html
xpcom/tests/TestArray.cpp
xpcom/tests/TestBase64.cpp
xpcom/tests/TestCOMArray.cpp
xpcom/tests/TestCallTemplates.cpp
xpcom/tests/TestHarness.h
xpcom/tests/TestObserverService.cpp
xpcom/tests/TestPipes.cpp
xpcom/tests/TestRacingServiceManager.cpp
xpcom/tests/TestThreadPool.cpp
xpcom/tests/TestThreadPoolListener.cpp
xpcom/tests/TestThreads.cpp
xpcom/tests/TestTimers.cpp
xpcom/tests/windows/TestCOM.cpp
xpcom/threads/LazyIdleThread.cpp
xpcom/threads/TimerThread.cpp
xpcom/threads/nsEnvironment.cpp
xpcom/threads/nsProcessCommon.cpp
xpcom/threads/nsThread.cpp
xpcom/threads/nsThreadManager.cpp
xpcom/threads/nsThreadPool.cpp
xpcom/threads/nsTimerImpl.cpp
xpfe/appshell/src/nsAppShellService.cpp
xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
xpfe/appshell/src/nsWebShellWindow.cpp
xpfe/appshell/src/nsWindowMediator.cpp
xpfe/components/directory/nsDirectoryViewer.cpp
xulrunner/examples/simple/components/src/SimpleTest.cpp
--- a/accessible/src/base/DocManager.cpp
+++ b/accessible/src/base/DocManager.cpp
@@ -113,20 +113,20 @@ DocManager::Shutdown()
     progress->RemoveProgressListener(static_cast<nsIWebProgressListener*>(this));
 
   ClearDocCache();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS3(DocManager,
-                   nsIWebProgressListener,
-                   nsIDOMEventListener,
-                   nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS(DocManager,
+                  nsIWebProgressListener,
+                  nsIDOMEventListener,
+                  nsISupportsWeakReference)
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIWebProgressListener
 
 NS_IMETHODIMP
 DocManager::OnStateChange(nsIWebProgress* aWebProgress,
                           nsIRequest* aRequest, uint32_t aStateFlags,
                           nsresult aStatus)
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -147,22 +147,22 @@ nsAccessibilityService::~nsAccessibility
 {
   NS_ASSERTION(gIsShutdown, "Accessibility wasn't shutdown!");
   gAccessibilityService = nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS_INHERITED4(nsAccessibilityService,
-                             DocManager,
-                             nsIAccessibilityService,
-                             nsIAccessibleRetrieval,
-                             nsIObserver,
-                             nsISelectionListener) // from SelectionManager
+NS_IMPL_ISUPPORTS_INHERITED(nsAccessibilityService,
+                            DocManager,
+                            nsIAccessibilityService,
+                            nsIAccessibleRetrieval,
+                            nsIObserver,
+                            nsISelectionListener) // from SelectionManager
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIObserver
 
 NS_IMETHODIMP
 nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic,
                          const char16_t *aData)
 {
@@ -251,17 +251,17 @@ public:
     sPluginTimers->RemoveElement(aTimer);
     return NS_OK;
   }
 
 private:
   nsCOMPtr<nsIContent> mContent;
 };
 
-NS_IMPL_ISUPPORTS1(PluginTimerCallBack, nsITimerCallback)
+NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback)
 #endif
 
 already_AddRefed<Accessible>
 nsAccessibilityService::CreatePluginAccessible(nsObjectFrame* aFrame,
                                                nsIContent* aContent,
                                                Accessible* aContext)
 {
   // nsObjectFrame means a plugin, so we need to use the accessibility support
--- a/accessible/src/generic/ARIAGridAccessible.cpp
+++ b/accessible/src/generic/ARIAGridAccessible.cpp
@@ -30,19 +30,19 @@ ARIAGridAccessible::
   ARIAGridAccessible(nsIContent* aContent, DocAccessible* aDoc) :
   AccessibleWrap(aContent, aDoc), xpcAccessibleTable(this)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridAccessible,
-                             Accessible,
-                             nsIAccessibleTable)
+NS_IMPL_ISUPPORTS_INHERITED(ARIAGridAccessible,
+                            Accessible,
+                            nsIAccessibleTable)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Accessible
 
 void
 ARIAGridAccessible::Shutdown()
 {
   mTable = nullptr;
@@ -535,19 +535,19 @@ ARIAGridCellAccessible::
   HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this)
 {
   mGenericTypes |= eTableCell;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible,
-                             HyperTextAccessible,
-                             nsIAccessibleTableCell)
+NS_IMPL_ISUPPORTS_INHERITED(ARIAGridCellAccessible,
+                            HyperTextAccessible,
+                            nsIAccessibleTableCell)
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessibleTableCell
 
 TableAccessible*
 ARIAGridCellAccessible::Table() const
 {
   Accessible* table = TableFor(Row());
--- a/accessible/src/generic/ApplicationAccessible.cpp
+++ b/accessible/src/generic/ApplicationAccessible.cpp
@@ -28,18 +28,18 @@ ApplicationAccessible::ApplicationAccess
 {
   mType = eApplicationType;
   mAppInfo = do_GetService("@mozilla.org/xre/app-info;1");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS_INHERITED1(ApplicationAccessible, Accessible,
-                             nsIAccessibleApplication)
+NS_IMPL_ISUPPORTS_INHERITED(ApplicationAccessible, Accessible,
+                            nsIAccessibleApplication)
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessible
 
 NS_IMETHODIMP
 ApplicationAccessible::GetParent(nsIAccessible** aAccessible)
 {
   NS_ENSURE_ARG_POINTER(aAccessible);
--- a/accessible/src/generic/FormControlAccessible.cpp
+++ b/accessible/src/generic/FormControlAccessible.cpp
@@ -27,19 +27,19 @@ template class mozilla::a11y::ProgressMe
 
 template<int Max>
 NS_IMPL_ADDREF_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible)
 
 template<int Max>
 NS_IMPL_RELEASE_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible)
 
 template<int Max>
-NS_IMPL_QUERY_INTERFACE_INHERITED1(ProgressMeterAccessible<Max>,
-                                   LeafAccessible,
-                                   nsIAccessibleValue)
+NS_IMPL_QUERY_INTERFACE_INHERITED(ProgressMeterAccessible<Max>,
+                                  LeafAccessible,
+                                  nsIAccessibleValue)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Accessible
 
 template<int Max>
 role
 ProgressMeterAccessible<Max>::NativeRole()
 {
--- a/accessible/src/generic/ImageAccessible.cpp
+++ b/accessible/src/generic/ImageAccessible.cpp
@@ -30,18 +30,18 @@ using namespace mozilla::a11y;
 
 ImageAccessible::
   ImageAccessible(nsIContent* aContent, DocAccessible* aDoc) :
   LinkableAccessible(aContent, aDoc)
 {
   mType = eImageType;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(ImageAccessible, Accessible,
-                             nsIAccessibleImage)
+NS_IMPL_ISUPPORTS_INHERITED(ImageAccessible, Accessible,
+                            nsIAccessibleImage)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Accessible public
 
 uint64_t
 ImageAccessible::NativeState()
 {
   // The state is a bitfield, get our inherited state, then logically OR it with
--- a/accessible/src/generic/RootAccessible.cpp
+++ b/accessible/src/generic/RootAccessible.cpp
@@ -48,17 +48,17 @@
 
 using namespace mozilla;
 using namespace mozilla::a11y;
 using namespace mozilla::dom;
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS_INHERITED1(RootAccessible, DocAccessible, nsIAccessibleDocument)
+NS_IMPL_ISUPPORTS_INHERITED(RootAccessible, DocAccessible, nsIAccessibleDocument)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Constructor/destructor
 
 RootAccessible::
   RootAccessible(nsIDocument* aDocument, nsIContent* aRootContent,
                  nsIPresShell* aPresShell) :
   DocAccessibleWrap(aDocument, aRootContent, aPresShell)
--- a/accessible/src/html/HTMLFormControlAccessible.cpp
+++ b/accessible/src/html/HTMLFormControlAccessible.cpp
@@ -287,20 +287,20 @@ HTMLButtonAccessible::IsWidget() const
 
 HTMLTextFieldAccessible::
   HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) :
   HyperTextAccessibleWrap(aContent, aDoc)
 {
   mType = eHTMLTextFieldType;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED2(HTMLTextFieldAccessible,
-                             Accessible,                             
-                             nsIAccessibleText,
-                             nsIAccessibleEditableText)
+NS_IMPL_ISUPPORTS_INHERITED(HTMLTextFieldAccessible,
+                            Accessible,                            
+                            nsIAccessibleText,
+                            nsIAccessibleEditableText)
 
 role
 HTMLTextFieldAccessible::NativeRole()
 {
   if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
                             nsGkAtoms::password, eIgnoreCase)) {
     return roles::PASSWORD_TEXT;
   }
--- a/accessible/src/html/HTMLLinkAccessible.cpp
+++ b/accessible/src/html/HTMLLinkAccessible.cpp
@@ -23,18 +23,18 @@ using namespace mozilla::a11y;
 
 HTMLLinkAccessible::
   HTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) :
   HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
 // Expose nsIAccessibleHyperLink unconditionally
-NS_IMPL_ISUPPORTS_INHERITED1(HTMLLinkAccessible, HyperTextAccessibleWrap,
-                             nsIAccessibleHyperLink)
+NS_IMPL_ISUPPORTS_INHERITED(HTMLLinkAccessible, HyperTextAccessibleWrap,
+                            nsIAccessibleHyperLink)
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessible
 
 role
 HTMLLinkAccessible::NativeRole()
 {
   return roles::LINK;
--- a/accessible/src/html/HTMLTableAccessible.cpp
+++ b/accessible/src/html/HTMLTableAccessible.cpp
@@ -49,19 +49,19 @@ HTMLTableCellAccessible::
   HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this)
 {
   mGenericTypes |= eTableCell;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLTableCellAccessible: nsISupports implementation
 
-NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellAccessible,
-                             HyperTextAccessible,
-                             nsIAccessibleTableCell)
+NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCellAccessible,
+                            HyperTextAccessible,
+                            nsIAccessibleTableCell)
 
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLTableCellAccessible: Accessible implementation
 
 void
 HTMLTableCellAccessible::Shutdown()
 {
   mTableCell = nullptr;
@@ -355,18 +355,18 @@ HTMLTableRowAccessible::NativeRole()
 {
   return roles::ROW;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLTableAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableAccessible, Accessible,
-                             nsIAccessibleTable)
+NS_IMPL_ISUPPORTS_INHERITED(HTMLTableAccessible, Accessible,
+                            nsIAccessibleTable)
 
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLTableAccessible: Accessible
 
 void
 HTMLTableAccessible::Shutdown()
 {
   mTable = nullptr;
--- a/accessible/src/xpcom/nsAccessibleRelation.cpp
+++ b/accessible/src/xpcom/nsAccessibleRelation.cpp
@@ -19,17 +19,17 @@ nsAccessibleRelation::nsAccessibleRelati
 {
   mTargets = do_CreateInstance(NS_ARRAY_CONTRACTID);
   nsIAccessible* targetAcc = nullptr;
   while ((targetAcc = aRel->Next()))
     mTargets->AppendElement(targetAcc, false);
 }
 
 // nsISupports
-NS_IMPL_ISUPPORTS1(nsAccessibleRelation, nsIAccessibleRelation)
+NS_IMPL_ISUPPORTS(nsAccessibleRelation, nsIAccessibleRelation)
 
 // nsIAccessibleRelation
 NS_IMETHODIMP
 nsAccessibleRelation::GetRelationType(uint32_t *aType)
 {
   NS_ENSURE_ARG_POINTER(aType);
   *aType = mType;
   return NS_OK;
--- a/accessible/src/xul/XULElementAccessibles.cpp
+++ b/accessible/src/xul/XULElementAccessibles.cpp
@@ -180,18 +180,18 @@ XULTooltipAccessible::NativeRole()
 
 XULLinkAccessible::
   XULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) :
   XULLabelAccessible(aContent, aDoc)
 {
 }
 
 // Expose nsIAccessibleHyperLink unconditionally
-NS_IMPL_ISUPPORTS_INHERITED1(XULLinkAccessible, XULLabelAccessible,
-                             nsIAccessibleHyperLink)
+NS_IMPL_ISUPPORTS_INHERITED(XULLinkAccessible, XULLabelAccessible,
+                            nsIAccessibleHyperLink)
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULLinkAccessible. nsIAccessible
 
 void
 XULLinkAccessible::Value(nsString& aValue)
 {
   aValue.Truncate();
--- a/accessible/src/xul/XULListboxAccessible.cpp
+++ b/accessible/src/xul/XULListboxAccessible.cpp
@@ -734,19 +734,19 @@ XULListCellAccessible::
   HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this)
 {
   mGenericTypes |= eTableCell;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS_INHERITED1(XULListCellAccessible,
-                             HyperTextAccessible,
-                             nsIAccessibleTableCell)
+NS_IMPL_ISUPPORTS_INHERITED(XULListCellAccessible,
+                            HyperTextAccessible,
+                            nsIAccessibleTableCell)
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULListCellAccessible: nsIAccessibleTableCell implementation
 
 TableAccessible*
 XULListCellAccessible::Table() const
 {
   Accessible* thisRow = Parent();
--- a/accessible/src/xul/XULTreeAccessible.cpp
+++ b/accessible/src/xul/XULTreeAccessible.cpp
@@ -705,18 +705,18 @@ XULTreeItemAccessibleBase::
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULTreeItemAccessibleBase: nsISupports implementation
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase, Accessible,
                                    mTree)
 
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase)
-  NS_INTERFACE_TABLE_INHERITED1(XULTreeItemAccessibleBase,
-                                XULTreeItemAccessibleBase)
+  NS_INTERFACE_TABLE_INHERITED(XULTreeItemAccessibleBase,
+                               XULTreeItemAccessibleBase)
 NS_INTERFACE_TABLE_TAIL_INHERITING(Accessible)
 NS_IMPL_ADDREF_INHERITED(XULTreeItemAccessibleBase, Accessible)
 NS_IMPL_RELEASE_INHERITED(XULTreeItemAccessibleBase, Accessible)
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULTreeItemAccessibleBase: nsIAccessible implementation
 
 Accessible*
--- a/accessible/src/xul/XULTreeGridAccessible.cpp
+++ b/accessible/src/xul/XULTreeGridAccessible.cpp
@@ -20,19 +20,19 @@
 #include "nsITreeSelection.h"
 #include "nsComponentManagerUtils.h"
 
 using namespace mozilla::a11y;
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULTreeGridAccessible: nsISupports implementation
 
-NS_IMPL_ISUPPORTS_INHERITED1(XULTreeGridAccessible,
-                             XULTreeAccessible,
-                             nsIAccessibleTable)
+NS_IMPL_ISUPPORTS_INHERITED(XULTreeGridAccessible,
+                            XULTreeAccessible,
+                            nsIAccessibleTable)
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULTreeGridAccessible: nsIAccessibleTable implementation
 
 uint32_t
 XULTreeGridAccessible::ColCount()
 {
   return nsCoreUtils::GetSensibleColumnCount(mTree);
@@ -452,19 +452,19 @@ XULTreeGridCellAccessible::
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULTreeGridCellAccessible: nsISupports implementation
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible, LeafAccessible,
                                    mTree, mColumn)
 
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible)
-  NS_INTERFACE_TABLE_INHERITED2(XULTreeGridCellAccessible,
-                                nsIAccessibleTableCell,
-                                XULTreeGridCellAccessible)
+  NS_INTERFACE_TABLE_INHERITED(XULTreeGridCellAccessible,
+                               nsIAccessibleTableCell,
+                               XULTreeGridCellAccessible)
 NS_INTERFACE_TABLE_TAIL_INHERITING(LeafAccessible)
 NS_IMPL_ADDREF_INHERITED(XULTreeGridCellAccessible, LeafAccessible)
 NS_IMPL_RELEASE_INHERITED(XULTreeGridCellAccessible, LeafAccessible)
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULTreeGridCellAccessible: nsIAccessible implementation
 
 void
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -8,17 +8,17 @@
 #include "AboutRedirector.h"
 #include "nsNetUtil.h"
 #include "nsIScriptSecurityManager.h"
 #include "mozilla/ArrayUtils.h"
 
 namespace mozilla {
 namespace browser {
 
-NS_IMPL_ISUPPORTS1(AboutRedirector, nsIAboutModule)
+NS_IMPL_ISUPPORTS(AboutRedirector, nsIAboutModule)
 
 struct RedirEntry {
   const char* id;
   const char* url;
   uint32_t flags;
 };
 
 /*
--- a/browser/components/dirprovider/DirectoryProvider.cpp
+++ b/browser/components/dirprovider/DirectoryProvider.cpp
@@ -22,19 +22,19 @@
 #include "nsServiceManagerUtils.h"
 #include "nsStringAPI.h"
 #include "nsXULAppAPI.h"
 #include "nsIPrefLocalizedString.h"
 
 namespace mozilla {
 namespace browser {
 
-NS_IMPL_ISUPPORTS2(DirectoryProvider,
-                   nsIDirectoryServiceProvider,
-                   nsIDirectoryServiceProvider2)
+NS_IMPL_ISUPPORTS(DirectoryProvider,
+                  nsIDirectoryServiceProvider,
+                  nsIDirectoryServiceProvider2)
 
 NS_IMETHODIMP
 DirectoryProvider::GetFile(const char *aKey, bool *aPersist, nsIFile* *aResult)
 {
   nsresult rv;
 
   *aResult = nullptr;
 
@@ -249,17 +249,17 @@ DirectoryProvider::GetFiles(const char *
       return NS_ERROR_OUT_OF_MEMORY;
 
     return NS_NewUnionEnumerator(aResult, extEnum, baseEnum);
   }
 
   return NS_ERROR_FAILURE;
 }
 
-NS_IMPL_ISUPPORTS1(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator)
+NS_IMPL_ISUPPORTS(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator)
 
 NS_IMETHODIMP
 DirectoryProvider::Append