From 015f495e42d57dd97189ef068ea993489cf9d901 Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Thu, 9 Apr 2015 10:10:51 -0700
Subject: [PATCH] Bug 1147562 - Update remaining callsites of newChannel before
 landing the shim in b2g/ (r=sicking)

---
 b2g/components/MailtoProtocolHandler.js | 6 +++++-
 b2g/components/SmsProtocolHandler.js    | 6 +++++-
 b2g/components/TelProtocolHandler.js    | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/b2g/components/MailtoProtocolHandler.js b/b2g/components/MailtoProtocolHandler.js
index 60b1bbaaff6..f74014cad2d 100644
--- a/b2g/components/MailtoProtocolHandler.js
+++ b/b2g/components/MailtoProtocolHandler.js
@@ -31,7 +31,7 @@ MailtoProtocolHandler.prototype = {
     return uri;
   },
 
-  newChannel: function Proto_newChannel(aURI) {
+  newChannel2: function Proto_newChannel2(aURI, aLoadInfo) {
     cpmm.sendAsyncMessage("mail-handler", {
       URI: aURI.spec,
       type: "mail" });
@@ -39,6 +39,10 @@ MailtoProtocolHandler.prototype = {
     throw Components.results.NS_ERROR_ILLEGAL_VALUE;
   },
 
+  newChannel: function Proto_newChannel(aURI) {
+    return newChannel2(aURI, null);
+  },
+
   classID: Components.ID("{50777e53-0331-4366-a191-900999be386c}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
 };
diff --git a/b2g/components/SmsProtocolHandler.js b/b2g/components/SmsProtocolHandler.js
index cfefcff0395..cffae870983 100644
--- a/b2g/components/SmsProtocolHandler.js
+++ b/b2g/components/SmsProtocolHandler.js
@@ -40,7 +40,7 @@ SmsProtocolHandler.prototype = {
     return uri;
   },
 
-  newChannel: function Proto_newChannel(aURI) {
+  newChannel2: function Proto_newChannel2(aURI, aLoadInfo) {
     let number = TelURIParser.parseURI('sms', aURI.spec);
     let body = "";
     let query = aURI.spec.split("?")[1];
@@ -65,6 +65,10 @@ SmsProtocolHandler.prototype = {
     throw Components.results.NS_ERROR_ILLEGAL_VALUE;
   },
 
+  newChannel: function Proto_newChannel(aURI) {
+    return newChannel2(aURI, null);
+  },
+
   classID: Components.ID("{81ca20cb-0dad-4e32-8566-979c8998bd73}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
 };
diff --git a/b2g/components/TelProtocolHandler.js b/b2g/components/TelProtocolHandler.js
index 38e0f2785cb..94f52484127 100644
--- a/b2g/components/TelProtocolHandler.js
+++ b/b2g/components/TelProtocolHandler.js
@@ -39,7 +39,7 @@ TelProtocolHandler.prototype = {
     return uri;
   },
 
-  newChannel: function Proto_newChannel(aURI) {
+  newChannel2: function Proto_newChannel(aURI, aLoadInfo) {
     let number = TelURIParser.parseURI('tel', aURI.spec);
 
     if (number) {
@@ -51,6 +51,10 @@ TelProtocolHandler.prototype = {
     throw Components.results.NS_ERROR_ILLEGAL_VALUE;
   },
 
+  newChannel: function Proto_newChannel(aURI) {
+    return newChannel2(aURI, null);
+  },
+
   classID: Components.ID("{782775dd-7351-45ea-aff1-0ffa872cfdd2}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
 };