Backed out changeset 75ed11ced625 (bug 1592915) for gtest failures on VP8VideoTrackEncoder.

dom/media/VideoFrameConverter.h

@@ -360,10 +360,7 @@ class VideoFrameConverter {
     rtc::scoped_refptr<webrtc::I420Buffer> buffer =
         mBufferPool.CreateBuffer(aFrame.mSize.width, aFrame.mSize.height);
     if (!buffer) {
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-      ++mFramesDropped;
-#endif
-      MOZ_DIAGNOSTIC_ASSERT(mFramesDropped <= 100, "Buffers must be leaking");
+      MOZ_DIAGNOSTIC_ASSERT(++mFramesDropped <= 100, "Buffers must be leaking");
       MOZ_LOG(gVideoFrameConverterLog, LogLevel::Warning,
               ("Creating a buffer failed"));
       return;

dom/media/gtest/TestVideoTrackEncoder.cpp

@@ -331,8 +331,7 @@ TEST(VP8VideoTrackEncoder, TimestampFrameEncode)
   uint64_t totalDuration = 0;
   size_t i = 0;
   for (auto& frame : frames) {
-    i++;
-    EXPECT_EQ(expectedDurations[i], frame->mDuration);
+    EXPECT_EQ(expectedDurations[i++], frame->mDuration);
     totalDuration += frame->mDuration;
   }
   const uint64_t pointThree = (PR_USEC_PER_SEC / 10) * 3;
@@ -381,8 +380,7 @@ TEST(VP8VideoTrackEncoder, DriftingFrameEncode)
   uint64_t totalDuration = 0;
   size_t i = 0;
   for (auto& frame : frames) {
-    i++;
-    EXPECT_EQ(expectedDurations[i], frame->mDuration);
+    EXPECT_EQ(expectedDurations[i++], frame->mDuration);
     totalDuration += frame->mDuration;
   }
   const uint64_t pointSix = (PR_USEC_PER_SEC / 10) * 6;