Bug 934125 - 2.b/3: fix alignment. r=gene
authorVicamo Yang <vyang@mozilla.com>
Mon, 13 Jan 2014 10:44:44 +0800
changeset 163101 2790b437e40327b115af447f78047f6a9ae2ea0b
parent 163100 e6a1ea2dec91d9f6a23f0ea23009da225b1e32dd
child 163102 e24b5206e3190a40c0cac23a029c8f6879701581
push id25980
push usercbook@mozilla.com
push dateMon, 13 Jan 2014 11:51:10 +0000
treeherdermozilla-central@80a27198344a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgene
bugs934125
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 934125 - 2.b/3: fix alignment. r=gene for f in `git show --name-only | grep ^dom/`; do [ -n "`grep -e '\w\+: function([^)]*\$' $f`" ] && echo $f; done | xargs sh -c 'rvim "$@" </dev/tty' asdf
dom/mobilemessage/src/gonk/MmsService.js
dom/mobilemessage/src/gonk/MobileMessageDB.jsm
dom/system/gonk/NetworkManager.js
dom/system/gonk/RILContentHelper.js
dom/system/gonk/RadioInterfaceLayer.js
dom/system/gonk/ril_worker.js
dom/telephony/gonk/TelephonyProvider.js
dom/voicemail/test/marionette/pdu_builder.js
--- a/dom/mobilemessage/src/gonk/MmsService.js
+++ b/dom/mobilemessage/src/gonk/MmsService.js
@@ -537,18 +537,17 @@ XPCOMUtils.defineLazyGetter(this, "gMmsT
      * @param url
      *        Target url string or null to be replaced by mmsc url.
      * @param istream
      *        An nsIInputStream instance as data source to be sent or null.
      * @param callback
      *        A callback function that takes two arguments: one for http
      *        status, the other for wrapped PDU data for further parsing.
      */
-    sendRequest: function(mmsConnection, method, url, istream,
-                                      callback) {
+    sendRequest: function(mmsConnection, method, url, istream, callback) {
       // TODO: bug 810226 - Support GPRS bearer for MMS transmission and reception.
       let cancellable = {
         callback: callback,
 
         isDone: false,
         isCancelled: false,
 
         cancel: function() {
@@ -610,18 +609,18 @@ XPCOMUtils.defineLazyGetter(this, "gMmsT
         cancellable.xhr = this.sendHttpRequest(mmsConnection, method,
                                                url, istream, proxyFilter,
                                                cancellable.done.bind(cancellable));
       }).bind(this));
 
       return cancellable;
     },
 
-    sendHttpRequest: function(mmsConnection, method, url,
-                                              istream, proxyFilter, callback) {
+    sendHttpRequest: function(mmsConnection, method, url, istream, proxyFilter,
+                              callback) {
       let releaseMmsConnectionAndCallback = function(httpStatus, data) {
         gpps.unregisterFilter(proxyFilter);
         // Always release the MMS network connection before callback.
         mmsConnection.release();
         callback(httpStatus, data);
       };
 
       try {
@@ -760,19 +759,18 @@ XPCOMUtils.defineLazyGetter(this, "gMmsT
           if (name && name.length > MMS.MMS_MAX_LENGTH_NAME_CONTENT_TYPE) {
             return false;
           }
         }
       }
       return true;
     },
 
-    translateHttpStatusToMmsStatus: function(httpStatus,
-                                              cancelledReason,
-                                              defaultStatus) {
+    translateHttpStatusToMmsStatus: function(httpStatus, cancelledReason,
+                                             defaultStatus) {
       switch(httpStatus) {
         case _HTTP_STATUS_USER_CANCELLED:
           return cancelledReason;
         case _HTTP_STATUS_RADIO_DISABLED:
           return _MMS_ERROR_RADIO_DISABLED;
         case _HTTP_STATUS_NO_SIM_CARD:
           return _MMS_ERROR_NO_SIM_CARD;
         case HTTP_STATUS_OK:
@@ -1444,19 +1442,18 @@ MmsService.prototype = {
    *
    * @param mmsConnection
    *        The MMS connection.
    * @param retrievalMode
    *        Retrieval mode for MMS receiving setting.
    * @param intermediate
    *        Intermediate MMS message parsed from PDU.
    */
-  convertIntermediateToSavable: function(mmsConnection,
-                                          intermediate,
-                                          retrievalMode) {
+  convertIntermediateToSavable: function(mmsConnection, intermediate,
+                                         retrievalMode) {
     intermediate.type = "mms";
     intermediate.delivery = DELIVERY_NOT_DOWNLOADED;
 
     let deliveryStatus;
     switch (retrievalMode) {
       case RETRIEVAL_MODE_MANUAL:
         deliveryStatus = DELIVERY_STATUS_MANUAL;
         break;
@@ -1494,19 +1491,17 @@ MmsService.prototype = {
    *        The MMS connection.
    * @param intermediate
    *        Intermediate MMS message parsed from PDU, which carries
    *        the retrieval confirmation.
    * @param savable
    *        The indexedDB savable MMS message, which is going to be
    *        merged with the extra retrieval confirmation.
    */
-  mergeRetrievalConfirmation: function(mmsConnection,
-                                                                  intermediate,
-                                                                  savable) {
+  mergeRetrievalConfirmation: function(mmsConnection, intermediate, savable) {
     // Prepare timestamp/sentTimestamp.
     savable.timestamp = Date.now();
     savable.sentTimestamp = intermediate.headers["date"].getTime();
 
     savable.receivers = [];
     // We don't have Bcc in recevied MMS message.
     for each (let type in ["cc", "to"]) {
       if (intermediate.headers[type]) {
@@ -1541,18 +1536,18 @@ MmsService.prototype = {
    * @param aContentLocation
    *        X-Mms-Content-Location of the message.
    * @param aCallback [optional]
    *        A callback function that takes two arguments: one for X-Mms-Status,
    *        the other parsed MMS message.
    * @param aDomMessage
    *        The nsIDOMMozMmsMessage object.
    */
-  retrieveMessage: function(aMmsConnection, aContentLocation,
-                                            aCallback, aDomMessage) {
+  retrieveMessage: function(aMmsConnection, aContentLocation, aCallback,
+                            aDomMessage) {
     // Notifying observers an MMS message is retrieving.
     Services.obs.notifyObservers(aDomMessage, kSmsRetrievingObserverTopic, null);
 
     let transaction = new RetrieveTransaction(aMmsConnection,
                                               aDomMessage.id,
                                               aContentLocation);
     transaction.run(aCallback);
   },
@@ -1618,21 +1613,18 @@ MmsService.prototype = {
 
     // Notifying observers an MMS message is received.
     Services.obs.notifyObservers(aDomMessage, kSmsReceivedObserverTopic, null);
   },
 
   /**
    * Callback for retrieveMessage.
    */
-  retrieveMessageCallback: function(mmsConnection,
-                                                            wish,
-                                                            savableMessage,
-                                                            mmsStatus,
-                                                            retrievedMessage) {
+  retrieveMessageCallback: function(mmsConnection, wish, savableMessage,
+                                    mmsStatus, retrievedMessage) {
     if (DEBUG) debug("retrievedMessage = " + JSON.stringify(retrievedMessage));
 
     let transactionId = savableMessage.headers["x-mms-transaction-id"];
 
     // The absence of the field does not indicate any default
     // value. So we go check the same field in the retrieved
     // message instead.
     if (wish == null && retrievedMessage) {
@@ -1699,21 +1691,18 @@ MmsService.prototype = {
 
       this.broadcastReceivedMessageEvent(domMessage);
     }).bind(this));
   },
 
   /**
    * Callback for saveReceivedMessage.
    */
-  saveReceivedMessageCallback: function(mmsConnection,
-                                         retrievalMode,
-                                         savableMessage,
-                                         rv,
-                                         domMessage) {
+  saveReceivedMessageCallback: function(mmsConnection, retrievalMode,
+                                        savableMessage, rv, domMessage) {
     let success = Components.isSuccessCode(rv);
     if (!success) {
       // At this point we could send a message to content to notify the
       // user that storing an incoming MMS notification indication failed,
       // ost likely due to a full disk.
       if (DEBUG) debug("Could not store MMS " + JSON.stringify(savableMessage) +
             ", error code " + rv);
       // Because MMSC will resend the notification indication once we don't
@@ -1769,18 +1758,17 @@ MmsService.prototype = {
   /**
    * Handle incoming M-Notification.ind PDU.
    *
    * @param serviceId
    *        The ID of the service for receiving the PDU data.
    * @param notification
    *        The parsed MMS message object.
    */
-  handleNotificationIndication: function(serviceId,
-                                                                      notification) {
+  handleNotificationIndication: function(serviceId, notification) {
     let transactionId = notification.headers["x-mms-transaction-id"];
     gMobileMessageDatabaseService.getMessageRecordByTransactionId(transactionId,
         (function(aRv, aMessageRecord) {
       if (Ci.nsIMobileMessageCallback.SUCCESS_NO_ERROR === aRv
           && aMessageRecord) {
         if (DEBUG) debug("We already got the NotificationIndication with transactionId = "
                          + transactionId + " before.");
         return;
@@ -1956,18 +1944,17 @@ MmsService.prototype = {
    *
    * A name for multipart object SHALL be encoded using name-parameter for Content-Type
    * header in WSP multipart headers. In decoding, name-parameter of Content-Type SHALL
    * be used if available. If name-parameter of Content-Type is not available, filename
    * parameter of Content-Disposition header SHALL be used if available. If neither
    * name-parameter of Content-Type header nor filename parameter of Content-Disposition
    * header is available, Content-Location header SHALL be used if available.
    */
-  createSavableFromParams: function(aMmsConnection,
-                                                            aParams, aMessage) {
+  createSavableFromParams: function(aMmsConnection, aParams, aMessage) {
     if (DEBUG) debug("createSavableFromParams: aParams: " + JSON.stringify(aParams));
 
     let isAddrValid = true;
     let smil = aParams.smil;
 
     // |aMessage.headers|
     let headers = aMessage["headers"] = {};
     let receivers = aParams.receivers;
--- a/dom/mobilemessage/src/gonk/MobileMessageDB.jsm
+++ b/dom/mobilemessage/src/gonk/MobileMessageDB.jsm
@@ -1289,18 +1289,17 @@ MobileMessageDB.prototype = {
         messageRecord.sentTimestamp = messageRecord.headers["date"].getTime();
       }
 
       cursor.update(messageRecord);
       cursor.continue();
     };
   },
 
-  matchParsedPhoneNumbers: function(addr1, parsedAddr1,
-                                                            addr2, parsedAddr2) {
+  matchParsedPhoneNumbers: function(addr1, parsedAddr1, addr2, parsedAddr2) {
     if ((parsedAddr1.internationalNumber &&
          parsedAddr1.internationalNumber === parsedAddr2.internationalNumber) ||
         (parsedAddr1.nationalNumber &&
          parsedAddr1.nationalNumber === parsedAddr2.nationalNumber)) {
       return true;
     }
 
     if (parsedAddr1.countryName != parsedAddr2.countryName) {
@@ -1418,18 +1417,18 @@ MobileMessageDB.prototype = {
                                                     subject,
                                                     smil,
                                                     attachments,
                                                     expiryDate,
                                                     readReportRequested);
     }
   },
 
-  findParticipantRecordByAddress: function(
-      aParticipantStore, aAddress, aCreate, aCallback) {
+  findParticipantRecordByAddress: function(aParticipantStore, aAddress,
+                                           aCreate, aCallback) {
     if (DEBUG) {
       debug("findParticipantRecordByAddress("
             + JSON.stringify(aAddress) + ", " + aCreate + ")");
     }
 
     // Two types of input number to match here, international(+886987654321),
     // and local(0987654321) types. The "nationalNumber" parsed from
     // phonenumberutils will be "987654321" in this case.
@@ -1523,18 +1522,18 @@ MobileMessageDB.prototype = {
         }
 
         // Check next participant record if available.
         cursor.continue();
       }).bind(this);
     }).bind(this);
   },
 
-  findParticipantIdsByAddresses: function(
-      aParticipantStore, aAddresses, aCreate, aSkipNonexistent, aCallback) {
+  findParticipantIdsByAddresses: function(aParticipantStore, aAddresses,
+                                          aCreate, aSkipNonexistent, aCallback) {
     if (DEBUG) {
       debug("findParticipantIdsByAddresses("
             + JSON.stringify(aAddresses) + ", "
             + aCreate + ", " + aSkipNonexistent + ")");
     }
 
     if (!aAddresses || !aAddresses.length) {
       if (DEBUG) debug("findParticipantIdsByAddresses: returning null");
@@ -1566,19 +1565,19 @@ MobileMessageDB.prototype = {
         } else if (result.indexOf(participantRecord.id) < 0) {
           result.push(participantRecord.id);
         }
         findParticipantId(index, result);
       });
     }) (0, []);
   },
 
-  findThreadRecordByParticipants: function(
-      aThreadStore, aParticipantStore, aAddresses,
-      aCreateParticipants, aCallback) {
+  findThreadRecordByParticipants: function(aThreadStore, aParticipantStore,
+                                           aAddresses, aCreateParticipants,
+                                           aCallback) {
     if (DEBUG) {
       debug("findThreadRecordByParticipants(" + JSON.stringify(aAddresses)
             + ", " + aCreateParticipants + ")");
     }
     this.findParticipantIdsByAddresses(aParticipantStore, aAddresses,
                                        aCreateParticipants, false,
                                        function(participantIds) {
       if (!participantIds) {
@@ -1665,18 +1664,18 @@ MobileMessageDB.prototype = {
       let participantStore = stores[1];
       let threadStore = stores[2];
       self.replaceShortMessageOnSave(txn, messageStore, participantStore,
                                      threadStore, aMessageRecord, aAddresses);
     }, [MESSAGE_STORE_NAME, PARTICIPANT_STORE_NAME, THREAD_STORE_NAME]);
   },
 
   replaceShortMessageOnSave: function(aTransaction, aMessageStore,
-                                       aParticipantStore, aThreadStore,
-                                       aMessageRecord, aAddresses) {
+                                      aParticipantStore, aThreadStore,
+                                      aMessageRecord, aAddresses) {
     let isReplaceTypePid = (aMessageRecord.pid) &&
                            ((aMessageRecord.pid >= RIL.PDU_PID_REPLACE_SHORT_MESSAGE_TYPE_1 &&
                              aMessageRecord.pid <= RIL.PDU_PID_REPLACE_SHORT_MESSAGE_TYPE_7) ||
                             aMessageRecord.pid == RIL.PDU_PID_RETURN_CALL_MESSAGE);
 
     if (aMessageRecord.type != "sms" ||
         aMessageRecord.delivery != DELIVERY_RECEIVED ||
         !isReplaceTypePid) {
@@ -1727,19 +1726,18 @@ MobileMessageDB.prototype = {
         // Match! Now replace that found message record with current one.
         aMessageRecord.id = foundMessageRecord.id;
         self.realSaveRecord(aTransaction, aMessageStore, aParticipantStore,
                             aThreadStore, aMessageRecord, aAddresses);
       };
     });
   },
 
-  realSaveRecord: function(aTransaction, aMessageStore,
-                                          aParticipantStore, aThreadStore,
-                                          aMessageRecord, aAddresses) {
+  realSaveRecord: function(aTransaction, aMessageStore, aParticipantStore,
+                           aThreadStore, aMessageRecord, aAddresses) {
     let self = this;
     this.findThreadRecordByParticipants(aThreadStore, aParticipantStore,
                                         aAddresses, true,
                                         function(threadRecord, participantIds) {
       if (!participantIds) {
         aTransaction.abort();
         return;
       }
@@ -1875,18 +1873,18 @@ MobileMessageDB.prototype = {
         PhoneNumberUtils.parseWithMCC(normalizedStoredAddress, null);
       if (this.matchPhoneNumbers(normalizedAddress, parsedAddress,
                                  normalizedStoredAddress, parsedStoredAddress)) {
         aCallback(element);
       }
     }
   },
 
-  updateMessageDeliveryById: function(
-      id, type, receiver, delivery, deliveryStatus, envelopeId, callback) {
+  updateMessageDeliveryById: function(id, type, receiver, delivery,
+                                      deliveryStatus, envelopeId, callback) {
     if (DEBUG) {
       debug("Setting message's delivery by " + type + " = "+ id
             + " receiver: " + receiver
             + " delivery: " + delivery
             + " deliveryStatus: " + deliveryStatus
             + " envelopeId: " + envelopeId);
     }
 
@@ -2015,21 +2013,18 @@ MobileMessageDB.prototype = {
       // own phone number), so we cannot correcly exclude the user's own
       // number from the receivers, thus wrongly building the thread index.
       if (DEBUG) debug("Error! Cannot strip out user's own phone number!");
     }
 
     threadParticipants = threadParticipants.concat(slicedReceivers);
   },
 
-  updateThreadByMessageChange: function(messageStore,
-                                                                    threadStore,
-                                                                    threadId,
-                                                                    messageId,
-                                                                    messageRead) {
+  updateThreadByMessageChange: function(messageStore, threadStore, threadId,
+                                        messageId, messageRead) {
     threadStore.get(threadId).onsuccess = function(event) {
       // This must exist.
       let threadRecord = event.target.result;
       if (DEBUG) debug("Updating thread record " + JSON.stringify(threadRecord));
 
       if (!messageRead) {
         threadRecord.unreadCount--;
       }
@@ -2219,32 +2214,32 @@ MobileMessageDB.prototype = {
     if (aMessage.type == "sms") {
       addresses = [aMessage.receiver];
     } else if (aMessage.type == "mms") {
       addresses = aMessage.receivers;
     }
     this.saveRecord(aMessage, addresses, aCallback);
   },
 
-  setMessageDeliveryByMessageId: function(
-      messageId, receiver, delivery, deliveryStatus, envelopeId, callback) {
+  setMessageDeliveryByMessageId: function(messageId, receiver, delivery,
+                                          deliveryStatus, envelopeId, callback) {
     this.updateMessageDeliveryById(messageId, "messageId",
                                    receiver, delivery, deliveryStatus,
                                    envelopeId, callback);
 
   },
 
   setMessageDeliveryStatusByEnvelopeId: function(aEnvelopeId, aReceiver,
-                                                  aDeliveryStatus, aCallback) {
+                                                 aDeliveryStatus, aCallback) {
     this.updateMessageDeliveryById(aEnvelopeId, "envelopeId", aReceiver, null,
                                    aDeliveryStatus, null, aCallback);
   },
 
   setMessageReadStatusByEnvelopeId: function(aEnvelopeId, aReceiver,
-                                              aReadStatus, aCallback) {
+                                             aReadStatus, aCallback) {
     if (DEBUG) {
       debug("Setting message's read status by envelopeId = " + aEnvelopeId +
             ", receiver: " + aReceiver + ", readStatus: " + aReadStatus);
     }
 
     let self = this;
     this.newTxnWithCallback(aCallback, function(aCapture, aMessageStore) {
       let getRequest = aMessageStore.index("envelopeId").get(aEnvelopeId);
@@ -2640,18 +2635,17 @@ let FilterSearcherHelper = {
    * @param direction
    *        NEXT or PREV.
    * @param txn
    *        Ongoing IDBTransaction context object.
    * @param collect
    *        Result colletor function. It takes three parameters -- txn, message
    *        id, and message timestamp.
    */
-  filterTimestamp: function(startDate, endDate, direction, txn,
-                                            collect) {
+  filterTimestamp: function(startDate, endDate, direction, txn, collect) {
     let range = null;
     if (startDate != null && endDate != null) {
       range = IDBKeyRange.bound(startDate.getTime(), endDate.getTime());
     } else if (startDate != null) {
       range = IDBKeyRange.lowerBound(startDate.getTime());
     } else if (endDate != null) {
       range = IDBKeyRange.upperBound(endDate.getTime());
     }
--- a/dom/system/gonk/NetworkManager.js
+++ b/dom/system/gonk/NetworkManager.js
@@ -782,19 +782,17 @@ NetworkManager.prototype = {
 
     gNetworkService.setWifiTethering(enable, config, (function(error) {
       let resetSettings = error;
       this.notifyError(resetSettings, callback, error);
     }).bind(this));
   },
 
   // Enable/disable USB tethering by sending commands to netd.
-  setUSBTethering: function(enable,
-                                            tetheringInterface,
-                                            callback) {
+  setUSBTethering: function(enable, tetheringInterface, callback) {
     let params = this.getUSBTetheringParameters(enable, tetheringInterface);
 
     if (params === null) {
       gNetworkService.enableUsbRndis(false, function() {
         this.usbTetheringResultReport("Invalid parameters");
       });
       return;
     }
--- a/dom/system/gonk/RILContentHelper.js
+++ b/dom/system/gonk/RILContentHelper.js
@@ -421,20 +421,17 @@ DOMCLIRStatus.prototype = {
 
 function DOMMMIError() {
 }
 DOMMMIError.prototype = {
   classDescription: "DOMMMIError",
   classID:          DOMMMIERROR_CID,
   contractID:       "@mozilla.org/dom/mmi-error;1",
   QueryInterface:   XPCOMUtils.generateQI([Ci.nsISupports]),
-  __init: function(serviceCode,
-                   name,
-                   message,
-                   additionalInformation) {
+  __init: function(serviceCode, name, message, additionalInformation) {
     this.__DOM_IMPL__.init(name, message);
     this.serviceCode = serviceCode;
     this.additionalInformation = additionalInformation;
   },
 };
 
 function IccCardLockError() {
 }
@@ -946,19 +943,17 @@ RILContentHelper.prototype = {
 
     cpmm.sendAsyncMessage("RIL:SetCardLock", {
       clientId: clientId,
       data: info
     });
     return request;
   },
 
-  getCardLockRetryCount: function(clientId,
-                                                        window,
-                                                        lockType) {
+  getCardLockRetryCount: function(clientId, window, lockType) {
     if (window == null) {
       throw Components.Exception("Can't get window object",
                                   Cr.NS_ERROR_UNEXPECTED);
     }
     let request = Services.DOMRequest.createRequest(window);
     let requestId = this.getRequestId(request);
     cpmm.sendAsyncMessage("RIL:GetCardLockRetryCount", {
       clientId: clientId,
@@ -1016,36 +1011,32 @@ RILContentHelper.prototype = {
     }
     response.command = command;
     cpmm.sendAsyncMessage("RIL:SendStkResponse", {
       clientId: clientId,
       data: response
     });
   },
 
-  sendStkMenuSelection: function(clientId,
-                                                      window,
-                                                      itemIdentifier,
-                                                      helpRequested) {
+  sendStkMenuSelection: function(clientId, window, itemIdentifier,
+                                 helpRequested) {
     if (window == null) {
       throw Components.Exception("Can't get window object",
                                   Cr.NS_ERROR_UNEXPECTED);
     }
     cpmm.sendAsyncMessage("RIL:SendStkMenuSelection", {
       clientId: clientId,
       data: {
         itemIdentifier: itemIdentifier,
         helpRequested: helpRequested
       }
     });
   },
 
-  sendStkTimerExpiration: function(clientId,
-                                                          window,
-                                                          timer) {
+  sendStkTimerExpiration: function(clientId, window, timer) {
     if (window == null) {
       throw Components.Exception("Can't get window object",
                                   Cr.NS_ERROR_UNEXPECTED);
     }
     cpmm.sendAsyncMessage("RIL:SendStkTimerExpiration", {
       clientId: clientId,
       data: {
         timer: timer
@@ -1972,18 +1963,17 @@ RILContentHelper.prototype = {
     }
 
     let contact = new window.mozContact(prop);
     contact.id = iccContact.contactId;
 
     this.fireRequestSuccess(message.requestId, contact);
   },
 
-  handleVoicemailNotification: function(clientId,
-                                                                    message) {
+  handleVoicemailNotification: function(clientId, message) {
     let changed = false;
     if (!this.voicemailStatuses[clientId]) {
       this.voicemailStatuses[clientId] = new VoicemailStatus(clientId);
     }
 
     let voicemailStatus = this.voicemailStatuses[clientId];
     if (voicemailStatus.hasMessages != message.active) {
       changed = true;
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -2838,18 +2838,17 @@ RadioInterface.prototype = {
       target.sendAsyncMessage("RIL:SetCallForwardingOptions", {
         clientId: this.clientId,
         data: response
       });
       return false;
     }).bind(this));
   },
 
-  setCallingLineIdRestriction: function(target,
-                                                                    message) {
+  setCallingLineIdRestriction: function(target, message) {
     if (DEBUG) {
       this.debug("setCallingLineIdRestriction: " + JSON.stringify(message));
     }
     this.workerMessenger.send("setCLIR", message, (function(response) {
       if (response.success) {
         this._updateCallingLineIdRestrictionPref(response.clirMode);
       }
       target.sendAsyncMessage("RIL:SetCallingLineIdRestriction", {
@@ -3714,18 +3713,17 @@ RadioInterface.prototype = {
                                                  pdptype: pdptype });
   },
 
   deactivateDataCall: function(cid, reason) {
     this.workerMessenger.send("deactivateDataCall", { cid: cid,
                                                       reason: reason });
   },
 
-  sendWorkerMessage: function(rilMessageType, message,
-                                                callback) {
+  sendWorkerMessage: function(rilMessageType, message, callback) {
     this.workerMessenger.send(rilMessageType, message, function(response) {
       return callback.handleResponse(response);
     });
   }
 };
 
 function RILNetworkInterface(radioInterface, apnSetting) {
   this.radioInterface = radioInterface;
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -9517,19 +9517,17 @@ let ICCPDUHelper = {
 
   /**
    * Write Alpha Identifier and Dialling number from TS 151.011 clause 10.5.1
    *
    * @param recordSize  The size of linear fixed record.
    * @param alphaId     Alpha Identifier to be written.
    * @param number      Dialling Number to be written.
    */
-  writeAlphaIdDiallingNumber: function(recordSize,
-                                                                  alphaId,
-                                                                  number) {
+  writeAlphaIdDiallingNumber: function(recordSize, alphaId, number) {
     // Write String length
     let strLen = recordSize * 2;
     Buf.writeInt32(strLen);
 
     let alphaLen = recordSize - ADN_FOOTER_SIZE_BYTES;
     this.writeAlphaIdentifier(alphaLen, alphaId);
     this.writeNumberWithLength(number);
 
--- a/dom/telephony/gonk/TelephonyProvider.js
+++ b/dom/telephony/gonk/TelephonyProvider.js
@@ -194,18 +194,17 @@ TelephonyProvider.prototype = {
            this._activeCall.clientId === aCall.clientId &&
            this._activeCall.callIndex === aCall.callIndex;
   },
 
   /**
    * Track the active call and update the audio system as its state changes.
    */
   _activeCall: null,
-  _updateCallAudioState: function(aCall,
-                                                        aConferenceState) {
+  _updateCallAudioState: function(aCall, aConferenceState) {
     if (aConferenceState === nsITelephonyProvider.CALL_STATE_CONNECTED) {
       this._activeCall = new ConferenceCall(aConferenceState);
       gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_IN_CALL;
       if (this.speakerEnabled) {
         gAudioManager.setForceForUse(nsIAudioManager.USE_COMMUNICATION,
                                      nsIAudioManager.FORCE_SPEAKER);
       }
       if (DEBUG) {
@@ -373,18 +372,17 @@ TelephonyProvider.prototype = {
     let index = this._listeners.indexOf(aListener);
     if (index < 0) {
       throw Cr.NS_ERROR_UNEXPECTED;
     }
 
     this._listeners.splice(index, 1);
   },
 
-  _enumerateCallsForClient: function(aClientId,
-                                                              aListener) {
+  _enumerateCallsForClient: function(aClientId, aListener) {
     if (DEBUG) debug("Enumeration of calls for client " + aClientId);
 
     let deferred = Promise.defer();
 
     this._getClient(aClientId).sendWorkerMessage("enumerateCalls", null,
                                                  (function(response) {
       for (let call of response.calls) {
         call.clientId = aClientId;
--- a/dom/voicemail/test/marionette/pdu_builder.js
+++ b/dom/voicemail/test/marionette/pdu_builder.js
@@ -39,21 +39,18 @@ let PDUBuilder = {
       } else {
         high = 0xF;
       }
 
       this.writeHexOctet((high << 4) | low);
     }
   },
 
-  writeStringAsSeptets: function(message,
-                                                      paddingBits,
-                                                      langIndex,
-                                                      langShiftIndex)
-  {
+  writeStringAsSeptets: function(message, paddingBits, langIndex,
+                                 langShiftIndex) {
     const langTable = RIL.PDU_NL_LOCKING_SHIFT_TABLES[langIndex];
     const langShiftTable = RIL.PDU_NL_SINGLE_SHIFT_TABLES[langShiftIndex];
 
     let dataBits = paddingBits;
     let data = 0;
     for (let i = 0; i < message.length; i++) {
       let septet = langTable.indexOf(message[i]);
       if (septet == RIL.PDU_NL_EXTENDED_ESCAPE) {