Bug 1113027 - Part 2: Should pass clientId to notifyDialCallSuccess (dom). r=hsinyi

dom/telephony/Telephony.cpp

@@ -224,7 +224,7 @@ Telephony::DialInternal(uint32_t aServiceId, const nsAString& aNumber,
   }
 
   nsCOMPtr<nsITelephonyDialCallback> callback =
-    new TelephonyDialCallback(GetOwner(), this, promise, aServiceId);
+    new TelephonyDialCallback(GetOwner(), this, promise);
 
   nsresult rv = mService->Dial(aServiceId, aNumber, aEmergency, callback);
   if (NS_FAILED(rv)) {

dom/telephony/TelephonyDialCallback.cpp

@@ -16,10 +16,8 @@ NS_IMPL_ISUPPORTS_INHERITED(TelephonyDialCallback, TelephonyCallback,
 
 TelephonyDialCallback::TelephonyDialCallback(nsPIDOMWindow* aWindow,
                                              Telephony* aTelephony,
-                                             Promise* aPromise,
+                                             Promise* aPromise)
-                                             uint32_t aServiceId)
+  : TelephonyCallback(aPromise), mWindow(aWindow), mTelephony(aTelephony)
-  : TelephonyCallback(aPromise), mWindow(aWindow), mTelephony(aTelephony),
-    mServiceId(aServiceId)
 {
   MOZ_ASSERT(mTelephony);
 }
@@ -52,12 +50,13 @@ TelephonyDialCallback::NotifyDialMMI(const nsAString& aServiceCode)
 }
 
 NS_IMETHODIMP
-TelephonyDialCallback::NotifyDialCallSuccess(uint32_t aCallIndex,
+TelephonyDialCallback::NotifyDialCallSuccess(uint32_t aClientId,
+                                             uint32_t aCallIndex,
                                              const nsAString& aNumber)
 {
   nsRefPtr<TelephonyCallId> id = mTelephony->CreateCallId(aNumber);
   nsRefPtr<TelephonyCall> call =
-      mTelephony->CreateCall(id, mServiceId, aCallIndex,
+      mTelephony->CreateCall(id, aClientId, aCallIndex,
                              nsITelephonyService::CALL_STATE_DIALING);
 
   mPromise->MaybeResolve(call);

dom/telephony/TelephonyDialCallback.h

@@ -31,7 +31,7 @@ public:
   NS_DECL_NSITELEPHONYDIALCALLBACK
 
   TelephonyDialCallback(nsPIDOMWindow* aWindow, Telephony* aTelephony,
-                        Promise* aPromise, uint32_t aServiceId);
+                        Promise* aPromise);
 
   NS_FORWARD_NSITELEPHONYCALLBACK(TelephonyCallback::)
 
@@ -44,7 +44,6 @@ private:
 
   nsCOMPtr<nsPIDOMWindow> mWindow;
   nsRefPtr<Telephony> mTelephony;
-  uint32_t mServiceId;
 
   nsString mServiceCode;
   nsRefPtr<MMICall> mMMICall;