Merge 171701

media/audio/mac/audio_input_mac.h

Index: media/audio/mac/audio_input_mac.h
===================================================================
--- media/audio/mac/audio_input_mac.h	(revision 172427)
+++ media/audio/mac/audio_input_mac.h	(working copy)
@@ -9,6 +9,7 @@
 #include <AudioToolbox/AudioFormat.h>
 
 #include "base/compiler_specific.h"
+#include "base/time.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
@@ -62,7 +63,7 @@
                          UInt32 num_packets,
                          const AudioStreamPacketDescription* packet_desc);
 
-  static const int kNumberBuffers = 1;
+  static const int kNumberBuffers = 3;
 
   // Manager that owns this stream, used for closing down.
   AudioManagerBase* manager_;
@@ -76,6 +77,8 @@
   uint32 buffer_size_bytes_;
   // True iff Start() has been called successfully.
   bool started_;
+  // Used to determine if we need to slow down |callback_| calls.
+  base::Time last_fill_;
 
   DISALLOW_COPY_AND_ASSIGN(PCMQueueInAudioInputStream);
 };