Backout bug 754062 (c53f474c502b) for xpcshell breakage
authorGregory Szorc <gps@mozilla.com>
Wed, 20 Jun 2012 11:51:49 -0700
changeset 100392 591fd1c696f0556fbbc6d49915d10a478b2695b0
parent 100391 ea34920bf049c3f7f6edd80369160685d2a4f344
child 100393 adb88277ea1949d14dd900e58835e89fd9cb4b35
push id1729
push userlsblakk@mozilla.com
push dateMon, 16 Jul 2012 20:02:43 +0000
treeherdermozilla-aurora@f4e75e148951 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs754062
milestone16.0a1
Backout bug 754062 (c53f474c502b) for xpcshell breakage
browser/installer/package-manifest.in
services/Makefile.in
services/makefiles.sh
services/notifications/Makefile.in
services/notifications/NotificationsComponents.manifest
services/notifications/README
services/notifications/service.js
services/notifications/services-notifications.js
services/notifications/tests/Makefile.in
services/notifications/tests/unit/head_helpers.js
services/notifications/tests/unit/test_service_start.js
services/notifications/tests/unit/xpcshell.ini
testing/xpcshell/xpcshell.ini
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -448,19 +448,16 @@
 @BINPATH@/components/nsPrompter.manifest
 @BINPATH@/components/nsPrompter.js
 #ifdef MOZ_SERVICES_SYNC
 @BINPATH@/components/SyncComponents.manifest
 @BINPATH@/components/AitcComponents.manifest
 @BINPATH@/components/Weave.js
 @BINPATH@/components/Aitc.js
 #endif
-#ifdef MOZ_SERVICES_NOTIFICATIONS
-@BINPATH@/components/NotificationsComponents.manifest
-#endif
 @BINPATH@/components/TelemetryPing.js
 @BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/messageWakeupService.js
 @BINPATH@/components/messageWakeupService.manifest
 @BINPATH@/components/SettingsManager.js
 @BINPATH@/components/SettingsManager.manifest
 @BINPATH@/components/Webapps.js
 @BINPATH@/components/Webapps.manifest
--- a/services/Makefile.in
+++ b/services/Makefile.in
@@ -6,12 +6,12 @@
 DEPTH     = ..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_SERVICES_SYNC
-PARALLEL_DIRS += aitc common crypto notifications sync
+PARALLEL_DIRS += aitc common crypto sync
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/services/makefiles.sh
+++ b/services/makefiles.sh
@@ -3,21 +3,19 @@
 # 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/.
 
 add_makefiles "
   services/Makefile
   services/common/Makefile
   services/crypto/Makefile
   services/crypto/component/Makefile
-  services/notifications/Makefile
   services/sync/Makefile
   services/sync/locales/Makefile
 "
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     services/common/tests/Makefile
     services/crypto/tests/Makefile
-    services/notifications/tests/Makefile
     services/sync/tests/Makefile
   "
 fi
deleted file mode 100644
--- a/services/notifications/Makefile.in
+++ /dev/null
@@ -1,32 +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/.
-
-DEPTH     = ../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-  NotificationsComponents.manifest \
-  $(NULL)
-
-PREF_JS_EXPORTS = $(srcdir)/services-notifications.js
-
-modules := \
-  service.js \
-  $(NULL)
-
-source_modules = $(foreach module,$(modules),$(srcdir)/$(module))
-module_dir = $(FINAL_TARGET)/modules/services-notifications
-
-GENERATED_DIRS += $(module_dir)
-
-libs::
-	$(NSINSTALL) $(source_modules) $(module_dir)
-
-TEST_DIRS += tests
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/services/notifications/NotificationsComponents.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-# Register resource aliases
-resource services-notifications resource:///modules/services-notifications/
deleted file mode 100644
--- a/services/notifications/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Here lies most of the moving parts for push notifcations in the browser. DOM
-and UI bindings will live elsewhere; these files deal with talking to the API,
-storing messages, and creating persistent connections to the notification
-server.
-
-Structure:
-
-services.js::Service
-  This is a singleton that manages API calls and message storage. It's an
-  instance of the NotificationSvc class. Messages and state are persisted to a
-  JSON file on disk.
deleted file mode 100644
--- a/services/notifications/service.js
+++ /dev/null
@@ -1,28 +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/. */
-
-const EXPORTED_SYMBOLS = ["Service"];
-
-const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
-
-Cu.import("resource://services-common/preferences.js");
-
-const PREFS_BRANCH = "services.notifications.";
-
-
-function NotificationSvc() {
-  this.ready = false;
-  this.prefs = new Preferences(PREFS_BRANCH);
-}
-NotificationSvc.prototype = {
-
-  get serverURL() this.prefs.get("serverURL"),
-
-  onStartup: function onStartup() {
-    this.ready = true;
-  }
-};
-
-let Service = new NotificationSvc();
-Service.onStartup();
deleted file mode 100644
--- a/services/notifications/services-notifications.js
+++ /dev/null
@@ -1,1 +0,0 @@
-pref("services.notifications.serverURL", "https://notifications.mozilla.org/");
deleted file mode 100644
--- a/services/notifications/tests/Makefile.in
+++ /dev/null
@@ -1,16 +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/.
-
-DEPTH          = ../../..
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = services/notifications/tests
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = test_services_notifications
-XPCSHELL_TESTS = unit
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/services/notifications/tests/unit/head_helpers.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
-
-let _ = function() print(Array.slice(arguments).join(" "));
deleted file mode 100644
--- a/services/notifications/tests/unit/test_service_start.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Check that everything is getting hooked together properly.
-function run_test() {
-  _("When imported, Service.onStartup is called.");
-  Cu.import("resource://services-notifications/service.js");
-
-  do_check_eq(Service.serverURL, "https://notifications.mozilla.org/");
-  do_check_eq(Service.ready, true);
-}
deleted file mode 100644
--- a/services/notifications/tests/unit/xpcshell.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-head = head_helpers.js
-tail =
-
-[test_service_start.js]
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -71,17 +71,16 @@ skip-if = os == "android"
 [include:widget/tests/unit/xpcshell.ini]
 [include:content/base/test/unit/xpcshell.ini]
 [include:content/test/unit/xpcshell.ini]
 [include:toolkit/components/url-classifier/tests/unit/xpcshell.ini]
 [include:services/aitc/tests/unit/xpcshell.ini]
 [include:services/common/tests/unit/xpcshell.ini]
 [include:services/crypto/tests/unit/xpcshell.ini]
 [include:services/crypto/components/tests/unit/xpcshell.ini]
-[include:services/notifications/tests/unit/xpcshell.ini]
 [include:services/sync/tests/unit/xpcshell.ini]
 # Bug 676978: tests hang on Android
 skip-if = os == "android"
 [include:browser/components/dirprovider/tests/unit/xpcshell.ini]
 [include:browser/components/downloads/test/unit/xpcshell.ini]
 [include:browser/components/feeds/test/unit/xpcshell.ini]
 [include:browser/components/migration/tests/unit/xpcshell.ini]
 [include:browser/components/places/tests/unit/xpcshell.ini]