Bug 749086 - 1/3: Use DOMRequest instead of SmsRequest. Interface changes. sr=sicking, r=bent

dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl

@@ -5,7 +5,6 @@
 #include "nsIDOMEventTarget.idl"
 
 interface nsIDOMEventListener;
-interface nsIDOMMozSmsRequest;
 interface nsIDOMMozSmsFilter;
 interface nsIDOMMozSmsSegmentInfo;
 interface nsIDOMDOMCursor;
@@ -20,15 +19,15 @@ dictionary MmsParameters
   jsval      attachments; // MmsAttachment[]
 };
 
-[scriptable, builtinclass, uuid(370da692-b79a-45d3-a07a-f9284e8c392b)]
+[scriptable, builtinclass, uuid(a7984cb3-27c8-4e3d-82a4-01553e93c078)]
 interface nsIDOMMozMobileMessageManager : nsIDOMEventTarget
 {
   nsIDOMMozSmsSegmentInfo getSegmentInfoForText(in DOMString text);
 
   // The first parameter can be either a DOMString (only one number) or an array
   // of DOMStrings.
-  // The method returns a SmsRequest object if one number has been passed.
-  // An array of SmsRequest objects otherwise.
+  // The method returns a DOMRequest object if one number has been passed.
+  // An array of DOMRequest objects otherwise.
   jsval send(in jsval number, in DOMString message);
 
   nsIDOMDOMRequest sendMMS(in jsval parameters /* MmsParameters */);

dom/mobilemessage/interfaces/nsIDOMSmsManager.idl

@@ -5,32 +5,32 @@
 #include "nsIDOMEventTarget.idl"
 
 interface nsIDOMDOMCursor;
+interface nsIDOMDOMRequest;
 interface nsIDOMEventListener;
-interface nsIDOMMozSmsRequest;
 interface nsIDOMMozSmsFilter;
 interface nsIDOMMozSmsSegmentInfo;
 
-[scriptable, builtinclass, uuid(7371acd3-136b-4081-b368-8f5c69a22103)]
+[scriptable, builtinclass, uuid(8ce00d77-71b4-43f6-92a1-2eae7c9581b9)]
 interface nsIDOMMozSmsManager : nsIDOMEventTarget
 {
   nsIDOMMozSmsSegmentInfo getSegmentInfoForText(in DOMString text);
 
   // The first parameter can be either a DOMString (only one number) or an array
   // of DOMStrings.
-  // The method returns a SmsRequest object if one number has been passed.
-  // An array of SmsRequest objects otherwise.
+  // The method returns a DOMRequest object if one number has been passed.
+  // An array of DOMRequest objects otherwise.
   jsval send(in jsval number, in DOMString message);
 
   [binaryname(GetMessageMoz)]
-  nsIDOMMozSmsRequest getMessage(in long id);
+  nsIDOMDOMRequest getMessage(in long id);
 
   // The parameter can be either a message id or a SmsMessage.
-  nsIDOMMozSmsRequest delete(in jsval param);
+  nsIDOMDOMRequest delete(in jsval param);
 
   // Iterates through nsIDOMMozSmsMessage.
   nsIDOMDOMCursor getMessages(in nsIDOMMozSmsFilter filter, in boolean reverse);
 
-  nsIDOMMozSmsRequest markMessageRead(in long id, in boolean aValue);
+  nsIDOMDOMRequest markMessageRead(in long id, in boolean aValue);
 
   // Iterates through nsIDOMMozMobileMessageThread.
   nsIDOMDOMCursor getThreads();

dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl

@@ -1,10 +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/. */
-
-#include "nsIDOMDOMRequest.idl"
-
-[scriptable, builtinclass, uuid(d77cafb5-7a91-4631-9597-5e4dcc9d90a5)]
-interface nsIDOMMozSmsRequest : nsIDOMDOMRequest
-{
-};

dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl

@@ -17,7 +17,7 @@ dictionary SmsThreadListItem
 interface nsIMobileMessageCallback : nsISupports
 {
   /**
-   * All SMS related errors that could apply to SmsRequest objects.
+   * All SMS related errors.
    * Make sure to keep this list in sync with the list in:
    * mobile/android/GeckoSmsManager.java
    */