Fix incorrect merge of security fix.

media/renderers/audio_renderer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/renderers/audio_renderer_impl.h"
 
 #include <math.h>
 #include <stddef.h>
 #include <algorithm>
 #include <utility>
@@ skipping 535 matching lines @@
     // weird behavior with multichannel wav files: http://crbug.com/600538.
     if (!buffer->end_of_stream() &&
         (buffer->sample_rate() != audio_parameters_.sample_rate() ||
          buffer->channel_count() != audio_parameters_.channels())) {
       MEDIA_LOG(ERROR, media_log_)
           << "Unsupported midstream configuration change!"
           << " Sample Rate: " << buffer->sample_rate() << " vs "
           << audio_parameters_.sample_rate()
           << ", Channels: " << buffer->channel_count() << " vs "
           << audio_parameters_.channels();
-      HandleAbortedReadOrDecodeError(PIPELINE_ERROR_DECODE);
+      HandleAbortedReadOrDecodeError(true);
       return;
     }
 
     if (!splicer_->AddInput(buffer)) {
       HandleAbortedReadOrDecodeError(true);
       return;
     }
   }
 
   if (!splicer_->HasNextBuffer()) {
@@ skipping 340 matching lines @@
            << buffering_state;
   DCHECK_NE(buffering_state_, buffering_state);
   lock_.AssertAcquired();
   buffering_state_ = buffering_state;
 
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(buffering_state_cb_, buffering_state_));
 }
 
 }  // namespace media