--- a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
+++ b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
@@ -1370,20 +1370,20 @@ TEST_P(JsepSessionTest, RenegotiationBot
   if (GetParam() == "datachannel") {
     return;
   }
 
   OfferAnswer();
 
   auto oHasStream = HasMediaStream(mSessionOff.GetLocalTracks());
   auto aHasStream = HasMediaStream(mSessionAns.GetLocalTracks());
-  ASSERT_EQ(oHasStream, GetLocalUniqueStreamIds(mSessionOff).size());
-  ASSERT_EQ(aHasStream, GetLocalUniqueStreamIds(mSessionAns).size());
-  ASSERT_EQ(aHasStream, GetRemoteUniqueStreamIds(mSessionOff).size());
-  ASSERT_EQ(oHasStream, GetRemoteUniqueStreamIds(mSessionAns).size());
+  ASSERT_EQ(oHasStream, GetLocalUniqueStreamIds(mSessionOff).size() > 0);
+  ASSERT_EQ(aHasStream, GetLocalUniqueStreamIds(mSessionAns).size() > 0);
+  ASSERT_EQ(aHasStream, GetRemoteUniqueStreamIds(mSessionOff).size()> 0);
+  ASSERT_EQ(oHasStream, GetRemoteUniqueStreamIds(mSessionAns).size() > 0);
 
   auto firstOffId = GetFirstLocalStreamId(mSessionOff);
   auto firstAnsId = GetFirstLocalStreamId(mSessionAns);
 
   auto offererPairs = GetTrackPairsByLevel(mSessionOff);
   auto answererPairs = GetTrackPairsByLevel(mSessionAns);
 
   std::vector<SdpMediaSection::MediaType> extraTypes;
@@ -1393,20 +1393,20 @@ TEST_P(JsepSessionTest, RenegotiationBot
   AddTracksToStream(mSessionAns, firstAnsId, extraTypes);
   types.insert(types.end(), extraTypes.begin(), extraTypes.end());
 
   OfferAnswer(CHECK_SUCCESS);
 
   oHasStream = HasMediaStream(mSessionOff.GetLocalTracks());
   aHasStream = HasMediaStream(mSessionAns.GetLocalTracks());
 
-  ASSERT_EQ(oHasStream, GetLocalUniqueStreamIds(mSessionOff).size());
-  ASSERT_EQ(aHasStream, GetLocalUniqueStreamIds(mSessionAns).size());
-  ASSERT_EQ(aHasStream, GetRemoteUniqueStreamIds(mSessionOff).size());
-  ASSERT_EQ(oHasStream, GetRemoteUniqueStreamIds(mSessionAns).size());
+  ASSERT_EQ(oHasStream, GetLocalUniqueStreamIds(mSessionOff).size() > 0);
+  ASSERT_EQ(aHasStream, GetLocalUniqueStreamIds(mSessionAns).size() > 0);
+  ASSERT_EQ(aHasStream, GetRemoteUniqueStreamIds(mSessionOff).size() > 0);
+  ASSERT_EQ(oHasStream, GetRemoteUniqueStreamIds(mSessionAns).size() > 0);
   if (oHasStream) {
     ASSERT_STREQ(firstOffId.c_str(),
                  GetFirstLocalStreamId(mSessionOff).c_str());
   }
   if (aHasStream) {
     ASSERT_STREQ(firstAnsId.c_str(),
                  GetFirstLocalStreamId(mSessionAns).c_str());
   }

--- a/media/webrtc/signaling/gtest/moz.build
+++ b/media/webrtc/signaling/gtest/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 # TODO: bug 1172551 - get these tests working on iOS
-if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit':
     LOCAL_INCLUDES += [
       '/ipc/chromium/src',
       '/media/mtransport',
       '/media/webrtc/',
       '/media/webrtc/signaling/src/common/time_profiling',
       '/media/webrtc/signaling/src/peerconnection',
     ]
 
@@ -25,8 +25,11 @@ if CONFIG['OS_TARGET'] != 'WINNT' and CO
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
 
 if CONFIG['_MSC_VER']:
     # This is intended as a temporary workaround to enable warning free building
     # with VS2015.
     # reinterpret_cast': conversion from 'DWORD' to 'HANDLE' of greater size
     CXXFLAGS += ['-wd4312']
+
+    # Disable warning for decorated name length exceeded, name was truncated
+    CXXFLAGS += ['-wd4503']

--- a/media/webrtc/signaling/gtest/sdp_unittests.cpp
+++ b/media/webrtc/signaling/gtest/sdp_unittests.cpp
@@ -327,23 +327,23 @@ TEST_F(SdpTest, parseRtcpFbNackAppFooBar
 TEST_F(SdpTest, parseRtcpFbNackFooBarBaz) {
   ParseSdp(kVideoSdp + "a=rtcp-fb:120 nack foo bar baz\r\n");
   ASSERT_EQ(sdp_attr_get_rtcp_fb_nack(sdp_ptr_, 1, 120, 1),
             SDP_RTCP_FB_NACK_UNKNOWN);
 }
 
 TEST_F(SdpTest, parseRtcpFbRemb) {
   ParseSdp(kVideoSdp + "a=rtcp-fb:120 goog-remb\r\n");
-  ASSERT_EQ(sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 1, 120), true);
+  ASSERT_EQ((bool)sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 1, 120), true);
 }
 
 TEST_F(SdpTest, parseRtcpRbRembAllPt) {
   ParseSdp(kVideoSdp + "a=rtcp-fb:* goog-remb\r\n");
-  ASSERT_EQ(sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 1, SDP_ALL_PAYLOADS),
-                                              true);
+  ASSERT_EQ((bool)sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 1, SDP_ALL_PAYLOADS),
+                                                    true);
 }
 
 TEST_F(SdpTest, parseRtcpFbTrrInt0) {
   ParseSdp(kVideoSdp + "a=rtcp-fb:120 trr-int 0\r\n");
   ASSERT_EQ(sdp_attr_get_rtcp_fb_trr_int(sdp_ptr_, 1, 120, 1), 0U);
 }
 
 TEST_F(SdpTest, parseRtcpFbTrrInt123) {
@@ -478,18 +478,18 @@ TEST_F(SdpTest, parseRtcpFbKitchenSink) 
             SDP_RTCP_FB_NACK_UNKNOWN);
   ASSERT_EQ(sdp_attr_get_rtcp_fb_nack(sdp_ptr_, 1, 120, 9),
             SDP_RTCP_FB_NACK_NOT_FOUND);
 
   ASSERT_EQ(sdp_attr_get_rtcp_fb_trr_int(sdp_ptr_, 1, 120, 1), 0U);
   ASSERT_EQ(sdp_attr_get_rtcp_fb_trr_int(sdp_ptr_, 1, 120, 2), 123U);
   ASSERT_EQ(sdp_attr_get_rtcp_fb_trr_int(sdp_ptr_, 1, 120, 3), 0xFFFFFFFF);
 
-  ASSERT_EQ(sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 1, 120), true);
-  ASSERT_EQ(sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 2, 120), false);
+  ASSERT_EQ((bool)sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 1, 120), true);
+  ASSERT_EQ((bool)sdp_attr_get_rtcp_fb_remb_enabled(sdp_ptr_, 2, 120), false);
 
   ASSERT_EQ(sdp_attr_get_rtcp_fb_ccm(sdp_ptr_, 1, 120, 1), SDP_RTCP_FB_CCM_FIR);
   ASSERT_EQ(sdp_attr_get_rtcp_fb_ccm(sdp_ptr_, 1, 120, 2),
             SDP_RTCP_FB_CCM_TMMBR);
   ASSERT_EQ(sdp_attr_get_rtcp_fb_ccm(sdp_ptr_, 1, 120, 3),
             SDP_RTCP_FB_CCM_TMMBR);
   ASSERT_EQ(sdp_attr_get_rtcp_fb_ccm(sdp_ptr_, 1, 120, 4),
             SDP_RTCP_FB_CCM_TSTR);