Add channel_count parameter back to AudioBuffer creation methods.

media/base/test_helpers.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/base/test_helpers.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
@@ skipping 133 matching lines @@
   return kNormalSize;
 }
 
 gfx::Size TestVideoConfig::LargeCodedSize() {
   return kLargeSize;
 }
 
 template <class T>
 scoped_refptr<AudioBuffer> MakeAudioBuffer(SampleFormat format,
                                            ChannelLayout channel_layout,
+                                           int channel_count,
                                            int sample_rate,
                                            T start,
                                            T increment,
                                            int frames,
                                            base::TimeDelta timestamp,
                                            base::TimeDelta duration) {
   int channels = ChannelLayoutToChannelCount(channel_layout);
-  scoped_refptr<AudioBuffer> output =
-      AudioBuffer::CreateBuffer(format, channel_layout, sample_rate, frames);
+  scoped_refptr<AudioBuffer> output = AudioBuffer::CreateBuffer(
+      format, channel_layout, channel_count, sample_rate, frames);
   output->set_timestamp(timestamp);
   output->set_duration(duration);
 
   // Create a block of memory with values:
   //   start
   //   start + increment
   //   start + 2 * increment, ...
   // For interleaved data, raw data will be:
   //   start
   //   start + channels * increment
@@ skipping 18 matching lines @@
   }
   return output;
 }
 
 // Instantiate all the types of MakeAudioBuffer() and
 // MakeAudioBuffer() needed.
 #define DEFINE_MAKE_AUDIO_BUFFER_INSTANCE(type)              \
   template scoped_refptr<AudioBuffer> MakeAudioBuffer<type>( \
       SampleFormat format,                                   \
       ChannelLayout channel_layout,                          \
+      int channel_count,                                     \
       int sample_rate,                                       \
       type start,                                            \
       type increment,                                        \
       int frames,                                            \
       base::TimeDelta start_time,                            \
       base::TimeDelta duration)
 DEFINE_MAKE_AUDIO_BUFFER_INSTANCE(uint8);
 DEFINE_MAKE_AUDIO_BUFFER_INSTANCE(int16);
 DEFINE_MAKE_AUDIO_BUFFER_INSTANCE(int32);
 DEFINE_MAKE_AUDIO_BUFFER_INSTANCE(float);
@@ skipping 28 matching lines @@
   int width = 0;
   int height = 0;
   bool success = pickle.ReadString(&header) && pickle.ReadInt(&width) &&
                  pickle.ReadInt(&height);
   return (success && header == kFakeVideoBufferHeader &&
           width == config.coded_size().width() &&
           height == config.coded_size().height());
 }
 
 }  // namespace media