Put browser side mixing back behind a flag.

media/audio/audio_manager_base.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/audio/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
@@ skipping 124 matching lines @@
 
 AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
     const AudioParameters& params) {
   DCHECK(GetMessageLoop()->BelongsToCurrentThread());
 
   scoped_refptr<AudioOutputDispatcher>& dispatcher =
       output_dispatchers_[params];
   if (!dispatcher) {
     base::TimeDelta close_delay =
         base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds);
-// TODO(dalecurtis): Temporarily disable the mixer for non-Windows/Mac platforms
-// until a fix for http://crbug.com/138098 can be found.
-#if defined(OS_WIN) || defined(OS_MACOSX)
     const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-    if (!cmd_line->HasSwitch(switches::kDisableAudioMixer)) {
+    // TODO(dalecurtis): Browser side mixing has a couple issues that must be
+    // fixed before it can be turned on by default: http://crbug.com/138098 and
+    // http://crbug.com/140247
+    if (cmd_line->HasSwitch(switches::kEnableAudioMixer)) {
       dispatcher = new AudioOutputMixer(this, params, close_delay);
-    } else
-#endif
-    {
+    } else {
       dispatcher = new AudioOutputDispatcherImpl(this, params, close_delay);
     }
   }
   return new AudioOutputProxy(dispatcher);
 }
 
 bool AudioManagerBase::CanShowAudioInputSettings() {
   return false;
 }
 
@@ skipping 74 matching lines @@
       // So, better crash now than later.
       DCHECK(dispatcher->HasOneRef()) << "AudioOutputProxies are still alive";
       dispatcher = NULL;
     }
   }
 
   output_dispatchers_.clear();
 }
 
 }  // namespace media