Add channel_count parameter back to AudioBuffer creation methods.

content/renderer/pepper/content_decryptor_delegate.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 "content/renderer/pepper/content_decryptor_delegate.h"
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 1006 matching lines @@
     // Setup channel pointers.  AudioBuffer::CopyFrom() will only use the first
     // one in the case of interleaved data.
     const int size_per_channel = frame_size / audio_channel_count_;
     for (int i = 0; i < audio_channel_count_; ++i)
       channel_ptrs[i] = cur + i * size_per_channel;
 
     const int frame_count = frame_size / audio_bytes_per_frame;
     scoped_refptr<media::AudioBuffer> frame = media::AudioBuffer::CopyFrom(
         sample_format,
         audio_channel_layout_,
+        audio_channel_count_,
         audio_samples_per_second_,
         frame_count,
         &channel_ptrs[0],
         base::TimeDelta::FromMicroseconds(timestamp),
         base::TimeDelta::FromMicroseconds(audio_samples_per_second_ /
                                           frame_count));
     frames->push_back(frame);
 
     cur += frame_size;
     bytes_left -= frame_size;
@@ skipping 22 matching lines @@
     const media::Decryptor::AudioBuffers empty_frames;
     audio_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError,
                                           empty_frames);
   }
 
   if (!video_decode_cb_.is_null())
     video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
 }
 
 }  // namespace content