Add channel_count parameter back to AudioBuffer creation methods.

media/base/test_helpers.h

 // 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.
 
 #ifndef MEDIA_BASE_TEST_HELPERS_H_
 #define MEDIA_BASE_TEST_HELPERS_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "media/base/channel_layout.h"
@@ skipping 96 matching lines @@
 //   |start| + 2 * |increment|, and so on.
 // Data for channel 1 will follow where channel 0 ends. Subsequent channels are
 // similar. No check is done that |format| requires data to be of type T, but it
 // is verified that |format| is a planar format.
 //
 // |start_time| will be used as the start time for the samples. |duration| is
 // the duration.
 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);
 
 // Create a fake video DecoderBuffer for testing purpose. The buffer contains
 // part of video decoder config info embedded so that the testing code can do
 // some sanity check.
 scoped_refptr<DecoderBuffer> CreateFakeVideoBufferForTest(
     const VideoDecoderConfig& config,
     base::TimeDelta timestamp,
     base::TimeDelta duration);
 
 // Verify if a fake video DecoderBuffer is valid.
 bool VerifyFakeVideoBufferForTest(const scoped_refptr<DecoderBuffer>& buffer,
                                   const VideoDecoderConfig& config);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_TEST_HELPERS_H_