Bug 987111 - Temporarily waive Xrays on the aOptions argument passed to mozId.watch and mozId.request. r=jedp

Bug 1011084 is getting hung up on various things, and we're currently blocked on
it because Object Xrays filter out callables. So let's just turn off Xrays here
for that case, so that we can enable them everywhere else.

dom/identity/nsDOMIdentity.js

@@ -102,6 +102,7 @@ nsDOMIdentity.prototype = {
    */
 
   watch: function nsDOMIdentity_watch(aOptions = {}) {
+    aOptions = Cu.waiveXrays(aOptions);
     if (this._rpWatcher) {
       // For the initial release of Firefox Accounts, we support callers who
       // invoke watch() either for Firefox Accounts, or Persona, but not both.
@@ -153,6 +154,7 @@ nsDOMIdentity.prototype = {
   },
 
   request: function nsDOMIdentity_request(aOptions = {}) {
+    aOptions = Cu.waiveXrays(aOptions);
     this._log("request: " + JSON.stringify(aOptions));
 
     // Has the caller called watch() before this?