Merge 169553

media/audio/audio_io.h

Index: media/audio/audio_io.h
===================================================================
--- media/audio/audio_io.h	(revision 172971)
+++ media/audio/audio_io.h	(working copy)
@@ -74,14 +74,10 @@
     // specific.
     virtual void OnError(AudioOutputStream* stream, int code) = 0;
 
-    // Waits till data becomes available. Used when buffering data starting
-    // new audio stream.
-    // Polling is not the best approach, but incorporating messaging loop
-    // with delayed tasks into guts of complex code is even worse, as it is
-    // very error-prone. We cannot easily add synchronization, interface is
-    // already cut in stone because of need of backward compatibility with
-    // plugins. In any case, data is usually immediately available,
-    // so there would be no delay.
+    // Deprecated.  DO NOT USE.  Waits until data becomes available.  Used only
+    // by Windows' WaveOut clients which may be extremely laggy.  Will yield the
+    // current thread until the renderer client has written its audio data or
+    // 1.5 seconds have elapsed.
     virtual void WaitTillDataReady() {}
 
    protected: