From 288e9c1407d1cd1b1ff82c219f9b055d32e4e526 Mon Sep 17 00:00:00 2001
From: Mukul Mishra <mkmishra1895@gmail.com>
Date: Thu, 27 Jul 2017 23:32:00 +0530
Subject: [PATCH] Removes wrapReason from sendStreamRequest and
 sendStreamResponse

---
 src/shared/util.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/shared/util.js b/src/shared/util.js
index 64049b0fa3687..343567058dcab 100644
--- a/src/shared/util.js
+++ b/src/shared/util.js
@@ -1447,7 +1447,6 @@ MessageHandler.prototype = {
 
     let sendStreamRequest = ({ stream, chunk, transfers,
                                success, reason, }) => {
-      reason = wrapReason(reason);
       this.postMessage({ sourceName, targetName, stream, streamId,
                          chunk, success, reason, }, transfers);
     };
@@ -1509,7 +1508,6 @@ MessageHandler.prototype = {
     let streamId = data.streamId;
 
     let sendStreamResponse = ({ stream, success, reason, }) => {
-      reason = wrapReason(reason);
       this.comObj.postMessage({ sourceName, targetName, stream,
                                 success, streamId, reason, });
     };
@@ -1531,11 +1529,11 @@ MessageHandler.prototype = {
     switch (data.stream) {
       case 'start_complete':
         resolveOrReject(this.streamControllers[data.streamId].startCall,
-                        data.success, data.reason);
+                        data.success, wrapReason(data.reason));
         break;
       case 'pull_complete':
         resolveOrReject(this.streamControllers[data.streamId].pullCall,
-                        data.success, data.reason);
+                        data.success, wrapReason(data.reason));
         break;
       case 'pull':
         // Ignore any pull after close is called.
@@ -1579,13 +1577,13 @@ MessageHandler.prototype = {
       case 'error':
         assert(this.streamControllers[data.streamId],
                'error should have stream controller');
-        let reason = wrapReason(data.reason);
-        this.streamControllers[data.streamId].controller.error(reason);
+        this.streamControllers[data.streamId].controller.
+          error(wrapReason(data.reason));
         deleteStreamController();
         break;
       case 'cancel_complete':
         resolveOrReject(this.streamControllers[data.streamId].cancelCall,
-                        data.success, data.reason);
+                        data.success, wrapReason(data.reason));
         deleteStreamController();
         break;
       case 'cancel':
@@ -1593,13 +1591,14 @@ MessageHandler.prototype = {
           break;
         }
         resolveCall(this.streamSinks[data.streamId].onCancel,
-                    [data.reason]).then(() => {
+                    [wrapReason(data.reason)]).then(() => {
           sendStreamResponse({ stream: 'cancel_complete', success: true, });
         }, (reason) => {
           sendStreamResponse({ stream: 'cancel_complete',
                                success: false, reason, });
         });
-        this.streamSinks[data.streamId].sinkCapability.reject(data.reason);
+        this.streamSinks[data.streamId].sinkCapability.
+          reject(wrapReason(data.reason));
         this.streamSinks[data.streamId].isCancelled = true;
         delete this.streamSinks[data.streamId];
         break;