From 37fdfc38c613b9a56fcb759ff5ae3ea3fc1421a6 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Thu, 21 Mar 2013 16:42:23 +1300
Subject: [PATCH] Backout bug 852831 (07e459058893) on a CLOSED TREE.

---
 content/media/AudioStream.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
index 7cca4de4072f..6e46071d4555 100644
--- a/content/media/AudioStream.cpp
+++ b/content/media/AudioStream.cpp
@@ -441,11 +441,7 @@ BufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate,
   params.rate = aRate;
   params.channels = aNumChannels;
 #if defined(__ANDROID__)
-#if defined(MOZ_B2G)
   params.stream_type = ConvertChannelToCubebType(aAudioChannelType);
-#else
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   if (params.stream_type == CUBEB_STREAM_TYPE_MAX) {
     return NS_ERROR_INVALID_ARG;