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

webkit/plugins/ppapi/resource_creation_impl.cc

Index: webkit/plugins/ppapi/resource_creation_impl.cc
===================================================================
--- webkit/plugins/ppapi/resource_creation_impl.cc	(revision 110608)
+++ webkit/plugins/ppapi/resource_creation_impl.cc	(working copy)
@@ -10,6 +10,7 @@
 #include "ppapi/shared_impl/var.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/ppb_audio_impl.h"
+#include "webkit/plugins/ppapi/ppb_audio_input_impl.h"
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
 #include "webkit/plugins/ppapi/ppb_context_3d_impl.h"
@@ -73,6 +74,20 @@
   return (new PPB_Audio_Impl(instance))->GetReference();
 }
 
+PP_Resource ResourceCreationImpl::CreateAudioInput(
+    PP_Instance instance,
+    PP_Resource config_id,
+    PPB_AudioInput_Callback audio_input_callback,
+    void* user_data) {
+  return PPB_AudioInput_Impl::Create(instance, config_id,
+      audio_input_callback, user_data);
+}
+
+PP_Resource ResourceCreationImpl::CreateAudioInputTrusted(
+    PP_Instance instance) {
+  return (new PPB_AudioInput_Impl(instance))->GetReference();
+}
+
 PP_Resource ResourceCreationImpl::CreateBroker(PP_Instance instance) {
   return (new PPB_Broker_Impl(instance))->GetReference();
 }
Property changes on: webkit/plugins/ppapi/resource_creation_impl.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/resource_creation_impl.cc:r3734-4217,4606-5108,5177-5263