bug 661574: Move nsITelemetry into toolkit r=Mossop

--HG--
rename : xpcom/base/Telemetry.cpp => toolkit/components/telemetry/Telemetry.cpp
rename : xpcom/base/nsITelemetry.idl => toolkit/components/telemetry/nsITelemetry.idl
rename : xpcom/tests/unit/test_nsITelemetry.js => toolkit/components/telemetry/tests/unit/test_nsITelemetry.js

browser/installer/package-manifest.in

@@ -261,6 +261,7 @@
 @BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
+@BINPATH@/components/telemetry.xpt
 
 ; JavaScript components
 @BINPATH@/components/ConsoleAPI.manifest

toolkit/components/telemetry/Makefile.in

@@ -44,14 +44,38 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = telemetry
+XPIDL_MODULE = telemetry
+MODULE_NAME = telemetry
+GRE_MODULE = 1
+
+LIBXUL_LIBRARY = 1
+EXPORT_LIBRARY = 1
+IS_COMPONENT = 1
+
+LIBRARY_NAME = telemetry
+
+XPIDLSRCS = \
+  nsITelemetry.idl \
+  $(NULL)
 
 EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
   TelemetryPing.js \
   $(NULL)
 
+CPPSRCS = \
+  Telemetry.cpp \
+  $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+  $(MOZ_COMPONENT_LIBS) \
+  $(MOZ_JS_LIBS) \
+  $(NULL)
+
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
+include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk

toolkit/components/telemetry/tests/unit/xpcshell.ini

@@ -2,4 +2,5 @@
 head = 
 tail = 
 
+[test_nsITelemetry.js]
 [test_TelemetryPing.js]

toolkit/library/libxul-config.mk

@@ -139,6 +139,7 @@ COMPONENT_LIBS += \
 	appcomps \
 	composer \
 	jetpack_s \
+	telemetry \
 	$(NULL)
 
 ifdef BUILD_CTYPES

xpcom/base/Makefile.in

@@ -70,7 +70,6 @@ CPPSRCS		= \
 		nsStackWalk.cpp \
 		nsMemoryReporterManager.cpp \
 		FunctionTimer.cpp \
-		Telemetry.cpp \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -140,7 +139,6 @@ XPIDLSRCS	= \
 		nsIUUIDGenerator.idl \
 		nsIMutable.idl \
 		nsIMemoryReporter.idl \
-		nsITelemetry.idl \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

xpcom/tests/unit/xpcshell.ini

@@ -21,7 +21,6 @@ tail =
 [test_mac_bundle.js]
 [test_nsIMutableArray.js]
 [test_nsIProcess.js]
-[test_nsITelemetry.js]
 [test_pipe.js]
 [test_storagestream.js]
 [test_streams.js]