Merge pull request #15885 from KevinGrandon/bug_966592_nightly_errors

Bug 966592 - Remove logged errors for DEBUG profiles r=fabrice
mozilla-b2g · Feb 3, 2014 · a574fdb · a574fdb
2 parents 11c3080 + 324c99e
commit a574fdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/tools/extensions/activities/components/ActivitiesGlue.js b/tools/extensions/activities/components/ActivitiesGlue.js
@@ -10,7 +10,6 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import('resource://gre/modules/ObjectWrapper.jsm');
 
 function ActivitiesDialog() {
   this._id = 0;
@@ -55,7 +54,7 @@ ActivitiesDialog.prototype = {
 
     let event = content.document.createEvent('CustomEvent');
     event.initCustomEvent('mozChromeEvent', true, true,
-                          ObjectWrapper.wrap(detail, content));
+                          Cu.cloneInto(detail, content));
     content.dispatchEvent(event);
   },
 

diff --git a/tools/extensions/browser-helper@gaiamobile.org/content/shell.js b/tools/extensions/browser-helper@gaiamobile.org/content/shell.js
@@ -26,15 +26,14 @@ function sendChromeEvent(details, type) {
 
   let event = content.document.createEvent('CustomEvent');
   event.initCustomEvent(type, true, true,
-                        ObjectWrapper.wrap(details, content));
+                        Cu.cloneInto(details, content));
   content.dispatchEvent(event);
 }
 
 // Listen for app.launch calls and forward them to the the system app.
 // Copy of /b2g/chrome/content/shell.js
 Cu.import('resource://gre/modules/Webapps.jsm');
 Cu.import('resource://gre/modules/AppsUtils.jsm');
-Cu.import('resource://gre/modules/ObjectWrapper.jsm');
 
 Services.obs.addObserver(function onLaunch(subject, topic, data) {
   let json = JSON.parse(data);