Revert "[Chromecast] Update mixer unittests"

This reverts commit 070d31f1.

Change-Id: I680c372a0e0dce7e24f889bf1a461db26329ed6d
Reviewed-on: https://chromium-review.googlesource.com/941602Reviewed-by: Kenneth MacKay <kmackay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539886}

chromecast/media/cma/backend/BUILD.gn

@@ -175,11 +175,11 @@ cast_source_set("for_mixer_audio") {
 test("cast_audio_backend_unittests") {
   testonly = true
   sources = [
-    "audio_fader_unittest.cc",
     "filter_group_unittest.cc",
     "mock_mixer_source.cc",
     "mock_mixer_source.h",
-    "stream_mixer_unittest.cc",
+
+    # "stream_mixer_unittest.cc",
   ]
 
   deps = [

chromecast/media/cma/backend/audio_fader.cc

@@ -84,8 +84,7 @@ void AudioFader::CompleteFill(::media::AudioBus* buffer, int filled_frames) {
     case State::kFadingOut:
       // Fade back in.
       state_ = State::kFadingIn;
-      fade_frames_remaining_ =
-          std::max(0, fade_frames_ - fade_frames_remaining_ - 1);
+      fade_frames_remaining_ = fade_frames_ - fade_frames_remaining_;
       break;
   }
   FadeIn(buffer, filled_frames);
@@ -101,8 +100,7 @@ void AudioFader::IncompleteFill(::media::AudioBus* buffer, int filled_frames) {
     case State::kFadingIn:
       // Fade back out.
       state_ = State::kFadingOut;
-      fade_frames_remaining_ =
-          std::max(0, fade_frames_ - fade_frames_remaining_ - 1);
+      fade_frames_remaining_ = fade_frames_ - fade_frames_remaining_;
       break;
     case State::kPlaying:
       // Fade out.