Fix incorrect AudioConverter setup for discrete channel layouts.

media/base/fake_audio_render_callback.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_FAKE_AUDIO_RENDER_CALLBACK_H_
 #define MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_
 
 #include "media/base/audio_converter.h"
 #include "media/base/audio_renderer_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 24 matching lines @@
                               base::TimeDelta buffer_delay) override;
 
   // Toggles only filling half the requested amount during Render().
   void set_half_fill(bool half_fill) { half_fill_ = half_fill; }
 
   // Reset the sine state to initial value.
   void reset() { x_ = 0; }
 
   // Returns the last |audio_delay_milliseconds| provided to Render() or -1 if
   // no Render() call occurred.
-  int last_audio_delay_milliseconds() { return last_audio_delay_milliseconds_; }
+  int last_audio_delay_milliseconds() const {
+    return last_audio_delay_milliseconds_;
+  }
 
   // Set volume information used by ProvideAudioTransformInput().
   void set_volume(double volume) { volume_ = volume; }
 
+  int last_channel_count() const { return last_channel_count_; }
+
  private:
   bool half_fill_;
   double x_;
   double step_;
   int last_audio_delay_milliseconds_;
+  int last_channel_count_;
   double volume_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeAudioRenderCallback);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FAKE_AUDIO_RENDER_CALLBACK_H_