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

ppapi/proxy/ppb_char_set_proxy.h

 // Copyright (c) 2010 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 PPAPI_PROXY_PPB_CHAR_SET_PROXY_H_
 #define PPAPI_PROXY_PPB_CHAR_SET_PROXY_H_
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/interface_proxy.h"
@@ skipping 11 matching lines @@
 class PPB_CharSet_Proxy : public ppapi::FunctionGroupBase,
                           public ppapi::thunk::PPB_CharSet_FunctionAPI,
                           public InterfaceProxy {
  public:
   PPB_CharSet_Proxy(Dispatcher* dispatcher, const void* target_interface);
   virtual ~PPB_CharSet_Proxy();
 
   static const Info* GetInfo();
 
   // FunctionGroupBase overrides.
-  virtual ppapi::thunk::PPB_CharSet_FunctionAPI* AsPPB_CharSet_FunctionAPI()
+  virtual ppapi::thunk::PPB_CharSet_FunctionAPI* AsCharSet_FunctionAPI()
       OVERRIDE;
 
   // PPB_CharSet_FunctionAPI implementation.
   virtual char* UTF16ToCharSet(PP_Instance instance,
                                const uint16_t* utf16, uint32_t utf16_len,
                                const char* output_char_set,
                                PP_CharSet_ConversionError on_error,
                                uint32_t* output_length) OVERRIDE;
   virtual uint16_t* CharSetToUTF16(PP_Instance instance,
                                    const char* input, uint32_t input_len,
                                    const char* input_char_set,
                                    PP_CharSet_ConversionError on_error,
                                    uint32_t* output_length) OVERRIDE;
   virtual PP_Var GetDefaultCharSet(PP_Instance instance) OVERRIDE;
 
   // InterfaceProxy implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
  private:
   void OnMsgGetDefaultCharSet(PP_Instance instance,
                               SerializedVarReturnValue result);
 
   DISALLOW_COPY_AND_ASSIGN(PPB_CharSet_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_PPB_CHAR_SET_PROXY_H_