bug 886526 - remove nsStaticComponents.{h,cpp} r=bsmedberg

config/Makefile.in

@@ -58,7 +58,6 @@ endif
 
 HEADERS_FILES = \
 	$(DEPTH)/mozilla-config.h \
-	$(srcdir)/nsStaticComponents.h \
 	$(NULL)
 HEADERS_DEST := $(DIST)/include
 HEADERS_TARGET := export

config/nsStaticComponents.cpp.in

@@ -1,36 +0,0 @@
-#line 2 "nsStaticComponents.cpp.in"
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#define XPCOM_TRANSLATE_NSGM_ENTRY_POINT 1
-
-#include "mozilla/ModuleUtils.h"
-#include "nsXPCOM.h"
-#include "nsMemory.h"
-#include "nsStaticComponents.h"
-
-/**
- * Declare an NSGetModule() routine for a generic module.
- */
-#define MODULE(_name) \
-    NSMODULE_DECL(_name);
-
-%MODULE_LIST%
-#line 57 "nsStaticComponents.cpp.in"
-
-#undef MODULE
-
-
-#define MODULE(_name) \
-    &NSMODULE_NAME(_name),
-
-/**
- * The nsStaticModuleInfo
- */
-const mozilla::Module *const *const kPStaticModules[] = {
-	%MODULE_LIST%
-#line 70 "nsStaticComponents.cpp.in"
-        NULL
-};

config/nsStaticComponents.h

@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsStaticComponents_h__
-#define nsStaticComponents_h__
-
-#include "mozilla/Module.h"
-
-// These symbols are provided by nsStaticComponents.cpp, and also by other
-// static component providers such as nsStaticXULComponents (libxul).
-
-extern mozilla::Module const *const *const kPStaticModules[];
-
-#endif

media/webrtc/signaling/test/mediaconduit_unittests.cpp

@@ -13,7 +13,6 @@ using namespace std;
 #include "mozilla/Scoped.h"
 #include <MediaConduitInterface.h>
 #include "nsIEventTarget.h"
-#include "nsStaticComponents.h"
 #include "FakeMediaStreamsImpl.h"
 
 #define GTEST_HAS_RTTI 0

media/webrtc/signaling/test/signaling_unittests.cpp

@@ -24,7 +24,6 @@
 #include "PeerConnectionImpl.h"
 #include "PeerConnectionCtx.h"
 #include "runnable_utils.h"
-#include "nsStaticComponents.h"
 #include "nsServiceManagerUtils.h"
 #include "nsNetUtil.h"
 #include "nsIIOService.h"

toolkit/library/nsStaticXULComponents.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/Module.h"
 #include "nsXPCOM.h"
-#include "nsStaticComponents.h"
 #include "nsMemory.h"
 
 #ifdef MOZ_AUTH_EXTENSION
@@ -246,7 +245,7 @@ XUL_MODULES
 #define MODULE(_name) \
     &NSMODULE_NAME(_name),
 
-const mozilla::Module *const *const kPStaticModules[] = {
+extern const mozilla::Module *const *const kPStaticModules[] = {
   XUL_MODULES
   NULL
 };

toolkit/xre/nsAppRunner.cpp

@@ -119,7 +119,6 @@ using mozilla::scache::StartupCache;
 #include "nsEmbedCID.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
-#include "nsStaticComponents.h"
 #include "nsXPCOM.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsXPIDLString.h"

xpcom/build/nsXPComInit.cpp

@@ -13,7 +13,6 @@
 #include "nsXPCOMPrivate.h"
 #include "nsXPCOMCIDInternal.h"
 
-#include "nsStaticComponents.h"
 #include "prlink.h"
 
 #include "nsCycleCollector.h"

xpcom/components/nsComponentManager.cpp

@@ -49,7 +49,6 @@
 #include "nsIClassInfo.h"
 #include "nsLocalFile.h"
 #include "nsReadableUtils.h"
-#include "nsStaticComponents.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"
 #include "prcmon.h"
@@ -79,6 +78,10 @@ using namespace mozilla;
 
 PRLogModuleInfo* nsComponentManagerLog = nullptr;
 
+// defined in nsStaticXULComponents.cpp to contain all the components in
+// libxul.
+extern mozilla::Module const *const *const kPStaticModules[];
+
 #if 0 || defined (DEBUG_timeless)
  #define SHOW_DENIED_ON_SHUTDOWN
  #define SHOW_CI_ON_EXISTING_SERVICE