From b66d34932bcb4e361e757951703b4b78ef9a1bd1 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Tue, 21 Oct 2014 11:51:12 +0200
Subject: [PATCH] Backed out changeset a5c28b69a261 (bug 978639)

---
 dom/telephony/TelephonyCallGroup.cpp | 22 ----------------------
 dom/telephony/TelephonyCallGroup.h   |  4 ----
 2 files changed, 26 deletions(-)

diff --git a/dom/telephony/TelephonyCallGroup.cpp b/dom/telephony/TelephonyCallGroup.cpp
index 318af9ae2f0c..4c1afc326f63 100644
--- a/dom/telephony/TelephonyCallGroup.cpp
+++ b/dom/telephony/TelephonyCallGroup.cpp
@@ -277,28 +277,6 @@ TelephonyCallGroup::Remove(TelephonyCall& aCall, ErrorResult& aRv)
   }
 }
 
-already_AddRefed<Promise>
-TelephonyCallGroup::HangUp(ErrorResult& aRv)
-{
-  MOZ_ASSERT(!mCalls.IsEmpty());
-
-  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetOwner());
-  if (!global) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return nullptr;
-  }
-
-  nsRefPtr<Promise> promise = Promise::Create(global, aRv);
-  NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
-
-  nsCOMPtr<nsITelephonyCallback> callback = new TelephonyCallback(promise);
-  aRv = mTelephony->Service()->HangUpConference(mCalls[0]->ServiceId(),
-                                                callback);
-  NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
-
-  return promise.forget();
-}
-
 void
 TelephonyCallGroup::Hold(ErrorResult& aRv)
 {
diff --git a/dom/telephony/TelephonyCallGroup.h b/dom/telephony/TelephonyCallGroup.h
index 91e1eae8996f..47981ee6b6bf 100644
--- a/dom/telephony/TelephonyCallGroup.h
+++ b/dom/telephony/TelephonyCallGroup.h
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_telephony_telephonycallgroup_h__
 #define mozilla_dom_telephony_telephonycallgroup_h__
 
-#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/telephony/TelephonyCommon.h"
 
 namespace mozilla {
@@ -53,9 +52,6 @@ public:
   void
   Remove(TelephonyCall& aCall, ErrorResult& aRv);
 
-  already_AddRefed<Promise>
-  HangUp(ErrorResult& aRv);
-
   void
   Hold(ErrorResult& aRv);