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

ppapi/proxy/resource_creation_proxy.cc

Index: ppapi/proxy/resource_creation_proxy.cc
===================================================================
--- ppapi/proxy/resource_creation_proxy.cc	(revision 110608)
+++ ppapi/proxy/resource_creation_proxy.cc	(working copy)
@@ -10,6 +10,7 @@
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppb_audio_input_proxy.h"
 #include "ppapi/proxy/ppb_audio_proxy.h"
 #include "ppapi/proxy/ppb_buffer_proxy.h"
 #include "ppapi/proxy/ppb_broker_proxy.h"
@@ -83,6 +84,22 @@
   return 0;
 }
 
+PP_Resource ResourceCreationProxy::CreateAudioInput(
+    PP_Instance instance,
+    PP_Resource config_id,
+    PPB_Audio_Callback audio_input_callback,
+    void* user_data) {
+  return PPB_AudioInput_Proxy::CreateProxyResource(instance, config_id,
+                                                   audio_input_callback,
+                                                   user_data);
+}
+
+PP_Resource ResourceCreationProxy::CreateAudioInputTrusted(
+    PP_Instance instance) {
+  // Proxied plugins can't created trusted audio input devices.
+  return 0;
+}
+
 PP_Resource ResourceCreationProxy::CreateBroker(PP_Instance instance) {
   return PPB_Broker_Proxy::CreateProxyResource(instance);
 }
Property changes on: ppapi/proxy/resource_creation_proxy.cc
___________________________________________________________________
Added: svn:mergeinfo