Revert 87415 - Convert more interfaces to the new thunk system. This goes up to and including

webkit/plugins/ppapi/ppb_audio_impl.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/shared_memory.h"
@@ skipping 16 matching lines @@
 
 // The implementation is actually in AudioConfigImpl.
 class PPB_AudioConfig_Impl : public Resource,
                              public ::ppapi::AudioConfigImpl {
  public:
   // Note that you must call Init (on AudioConfigImpl) before using this class.
   PPB_AudioConfig_Impl(PluginInstance* instance);
   virtual ~PPB_AudioConfig_Impl();
 
   // ResourceObjectBase overrides.
-  virtual ::ppapi::thunk::PPB_AudioConfig_API* AsPPB_AudioConfig_API() OVERRIDE;
+  virtual ::ppapi::thunk::PPB_AudioConfig_API* AsAudioConfig_API() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PPB_AudioConfig_Impl);
 };
 
 // Some of the backend functionality of this class is implemented by the
 // AudioImpl so it can be shared with the proxy.
 class PPB_Audio_Impl : public Resource,
                        public ::ppapi::AudioImpl,
                        public ::ppapi::thunk::PPB_AudioTrusted_API,
                        public PluginDelegate::PlatformAudio::Client {
  public:
   // After creation, either call Init (for non-trusted init) or OpenTrusted
   // (for trusted init).
   explicit PPB_Audio_Impl(PluginInstance* instance);
   virtual ~PPB_Audio_Impl();
 
   // Initialization function for non-trusted init.
   bool Init(PP_Resource config_id,
             PPB_Audio_Callback user_callback, void* user_data);
 
   // ResourceObjectBase overrides.
-  virtual ::ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API();
-  virtual ::ppapi::thunk::PPB_AudioTrusted_API* AsPPB_AudioTrusted_API();
+  virtual ::ppapi::thunk::PPB_Audio_API* AsAudio_API();
+  virtual ::ppapi::thunk::PPB_AudioTrusted_API* AsAudioTrusted_API();
 
   // PPB_Audio_API implementation.
   virtual PP_Resource GetCurrentConfig() OVERRIDE;
   virtual PP_Bool StartPlayback() OVERRIDE;
   virtual PP_Bool StopPlayback() OVERRIDE;
 
   // PPB_AudioTrusted_API implementation.
   virtual int32_t OpenTrusted(PP_Resource config_id,
                               PP_CompletionCallback create_callback) OVERRIDE;
   virtual int32_t GetSyncSocket(int* sync_socket) OVERRIDE;
@@ skipping 26 matching lines @@
   size_t shared_memory_size_for_create_callback_;
   scoped_ptr<base::SyncSocket> socket_for_create_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Audio_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_