Revert 110602 - Revert 110587 - Microphone support for Pepper Flash.

webkit/plugins/ppapi/mock_plugin_delegate.cc

Index: webkit/plugins/ppapi/mock_plugin_delegate.cc
===================================================================
--- webkit/plugins/ppapi/mock_plugin_delegate.cc	(revision 110608)
+++ webkit/plugins/ppapi/mock_plugin_delegate.cc	(working copy)
@@ -71,10 +71,17 @@
 MockPluginDelegate::PlatformAudio* MockPluginDelegate::CreateAudio(
     uint32_t sample_rate,
     uint32_t sample_count,
-    PlatformAudio::Client* client) {
+    PlatformAudioCommonClient* client) {
   return NULL;
 }
 
+MockPluginDelegate::PlatformAudioInput* MockPluginDelegate::CreateAudioInput(
+    uint32_t sample_rate,
+    uint32_t sample_count,
+    PlatformAudioCommonClient* client) {
+  return NULL;
+}
+
 MockPluginDelegate::PpapiBroker* MockPluginDelegate::ConnectToPpapiBroker(
     PPB_Broker_Impl* client) {
   return NULL;
Property changes on: webkit/plugins/ppapi/mock_plugin_delegate.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/mock_plugin_delegate.cc:r3734-4217,4606-5108,5177-5263