Add channel_count parameter back to AudioBuffer creation methods.

media/base/audio_splicer_unittest.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 "base/memory/scoped_ptr.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_bus.h"
 #include "media/base/audio_splicer.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/buffers.h"
@@ skipping 20 matching lines @@
   }
 
   scoped_refptr<AudioBuffer> GetNextInputBuffer(float value) {
     return GetNextInputBuffer(value, kDefaultBufferSize);
   }
 
   scoped_refptr<AudioBuffer> GetNextInputBuffer(float value, int frame_size) {
     scoped_refptr<AudioBuffer> buffer = MakeAudioBuffer<float>(
         kSampleFormat,
         kChannelLayout,
+        kChannels,
         kDefaultSampleRate,
         value,
         0.0f,
         frame_size,
         input_timestamp_helper_.GetTimestamp(),
         input_timestamp_helper_.GetFrameDuration(frame_size));
     input_timestamp_helper_.AddFrames(frame_size);
     return buffer;
   }
 
@@ skipping 72 matching lines @@
 
   bool AddInput(const scoped_refptr<AudioBuffer>& input) {
     // Since the splicer doesn't make copies it's working directly on the input
     // buffers.  We must make a copy before adding to ensure the original buffer
     // is not modified in unexpected ways.
     scoped_refptr<AudioBuffer> buffer_copy =
         input->end_of_stream()
             ? AudioBuffer::CreateEOSBuffer()
             : AudioBuffer::CopyFrom(kSampleFormat,
                                     input->channel_layout(),
+                                    input->channel_count(),
                                     input->sample_rate(),
                                     input->frame_count(),
                                     &input->channel_data()[0],
                                     input->timestamp(),
                                     input->duration());
     return splicer_.AddInput(buffer_copy);
   }
 
   base::TimeDelta max_crossfade_duration() {
     return splicer_.max_crossfade_duration_;
@@ skipping 478 matching lines @@
   // now available.
   EXPECT_TRUE(AddInput(second_buffer));
   ASSERT_TRUE(splicer_.HasNextBuffer());
 
   VerifyNextBuffer(first_buffer);
   VerifyNextBuffer(second_buffer);
   EXPECT_FALSE(splicer_.HasNextBuffer());
 }
 
 }  // namespace media