Use the browser UI thread for audio on OSX.

media/base/media_switches.h

Index: media/base/media_switches.h
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index 1a1522f043c958100f3881f1ec5786d7f82b6d06..166672bce9c9ba9f085c2c79e4e45da11901cc2b 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -12,40 +12,41 @@
 
 namespace switches {
 
-#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_SOLARIS)
-extern const char kAlsaOutputDevice[];
-extern const char kAlsaInputDevice[];
-#endif
-
 MEDIA_EXPORT extern const char kAudioBufferSize[];

[scherkus (not reviewing), 2013/05/31 19:30:35]

what's up with the big diff? alphabetizing?

[DaleCurtis, 2013/06/03 19:51:10]

Yeah, this has bugged me for a long time :)

 
-#if defined(USE_CRAS)
-MEDIA_EXPORT extern const char kUseCras[];
-#endif
-
-#if defined(OS_WIN)
-MEDIA_EXPORT extern const char kEnableExclusiveAudio[];
-MEDIA_EXPORT extern const char kForceWaveAudio[];
-#endif
-
-MEDIA_EXPORT extern const char kVideoThreads[];
-
 MEDIA_EXPORT extern const char kDisableEncryptedMedia[];
 
+MEDIA_EXPORT extern const char kEnableEac3Playback[];
+
 MEDIA_EXPORT extern const char kEnableOpusPlayback[];
 
+MEDIA_EXPORT extern const char kEnableVp8AlphaPlayback[];
+
 MEDIA_EXPORT extern const char kEnableVp9Playback[];
 
-MEDIA_EXPORT extern const char kEnableVp8AlphaPlayback[];
+MEDIA_EXPORT extern const char kVideoThreads[];
 
-MEDIA_EXPORT extern const char kEnableEac3Playback[];
+#if defined(GOOGLE_TV)
+MEDIA_EXPORT extern const char kUseExternalVideoSurfaceThresholdInPixels[];
+#endif
+
+#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_SOLARIS)
+MEDIA_EXPORT extern const char kAlsaInputDevice[];
+MEDIA_EXPORT extern const char kAlsaOutputDevice[];
+#endif
+
+#if defined(OS_MACOSX)
+MEDIA_EXPORT extern const char kDisableMainThreadAudio[];
+#endif
 
 #if defined(OS_WIN)
+MEDIA_EXPORT extern const char kEnableExclusiveAudio[];
+MEDIA_EXPORT extern const char kForceWaveAudio[];
 MEDIA_EXPORT extern const char kWaveOutBuffers[];
 #endif
 
-#if defined(GOOGLE_TV)
-MEDIA_EXPORT extern const char kUseExternalVideoSurfaceThresholdInPixels[];
+#if defined(USE_CRAS)
+MEDIA_EXPORT extern const char kUseCras[];
 #endif
 
 }  // namespace switches