Get the audio proxy building as untrusted code for NaCl.

BUG=116317
TEST=compiles
Review URL: https://chromiumcodereview.appspot.com/10694115

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145971 0039d316-1c4b-4281-b951-d872f2087c98

ppapi/proxy/ppb_audio_proxy.cc

@@ -171,7 +171,6 @@ bool PPB_Audio_Proxy::OnMessageReceived(const IPC::Message& msg) {
   return handled;
 }
 
-#if !defined(OS_NACL)
 void PPB_Audio_Proxy::OnMsgCreate(PP_Instance instance_id,
                                   int32_t sample_rate,
                                   uint32_t sample_frame_count,
@@ -295,7 +294,6 @@ int32_t PPB_Audio_Proxy::GetAudioConnectedHandles(
 
   return PP_OK;
 }
-#endif  // !defined(OS_NACL)
 
 // Processed in the plugin (message from host).
 void PPB_Audio_Proxy::OnMsgNotifyAudioStreamCreated(

ppapi/proxy/resource_creation_proxy.cc

@@ -168,6 +168,11 @@ PP_Resource ResourceCreationProxy::CreateAudio(
                                               audio_callback, user_data);
 }
 
+PP_Resource ResourceCreationProxy::CreateAudioTrusted(PP_Instance instance) {
+  // Proxied plugins can't create trusted audio devices.
+  return 0;
+}
+
 PP_Resource ResourceCreationProxy::CreateAudioConfig(
     PP_Instance instance,
     PP_AudioSampleRate sample_rate,
@@ -192,11 +197,6 @@ PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance instance,
 }
 
 #if !defined(OS_NACL)
-PP_Resource ResourceCreationProxy::CreateAudioTrusted(PP_Instance instance) {
-  // Proxied plugins can't create trusted audio devices.
-  return 0;
-}
-
 PP_Resource ResourceCreationProxy::CreateAudioInput0_1(
     PP_Instance instance,
     PP_Resource config_id,

ppapi/proxy/resource_creation_proxy.h

@@ -90,6 +90,7 @@ class ResourceCreationProxy : public InterfaceProxy,
                                   PP_Resource config_id,
                                   PPB_Audio_Callback audio_callback,
                                   void* user_data) OVERRIDE;
+  virtual PP_Resource CreateAudioTrusted(PP_Instance instance) OVERRIDE;
   virtual PP_Resource CreateAudioConfig(PP_Instance instance,
                                         PP_AudioSampleRate sample_rate,
                                         uint32_t sample_frame_count) OVERRIDE;
@@ -101,7 +102,6 @@ class ResourceCreationProxy : public InterfaceProxy,
                                        const PP_Size& size,
                                        PP_Bool is_always_opaque) OVERRIDE;
 #if !defined(OS_NACL)
-  virtual PP_Resource CreateAudioTrusted(PP_Instance instance) OVERRIDE;
   virtual PP_Resource CreateAudioInput0_1(
       PP_Instance instance,
       PP_Resource config_id,

ppapi/thunk/resource_creation_api.h

@@ -95,6 +95,7 @@ class ResourceCreationAPI {
                                   PP_Resource config_id,
                                   PPB_Audio_Callback audio_callback,
                                   void* user_data) = 0;
+  virtual PP_Resource CreateAudioTrusted(PP_Instance instance) = 0;
   virtual PP_Resource CreateAudioConfig(PP_Instance instance,
                                         PP_AudioSampleRate sample_rate,
                                         uint32_t sample_frame_count) = 0;
@@ -106,7 +107,6 @@ class ResourceCreationAPI {
                                        const PP_Size& size,
                                        PP_Bool is_always_opaque) = 0;
 #if !defined(OS_NACL)
-  virtual PP_Resource CreateAudioTrusted(PP_Instance instance) = 0;
   virtual PP_Resource CreateAudioInput0_1(
       PP_Instance instance,
       PP_Resource config_id,