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

ppapi/proxy/ppb_char_set_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_char_set_proxy.h"
 
 #include "base/basictypes.h"
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
@@ skipping 34 matching lines @@
     ppapi::thunk::GetPPB_CharSet_Thunk(),
     PPB_CHAR_SET_DEV_INTERFACE,
     INTERFACE_ID_PPB_CHAR_SET,
     false,
     &CreateCharSetProxy,
   };
   return &info;
 }
 
 ppapi::thunk::PPB_CharSet_FunctionAPI*
-PPB_CharSet_Proxy::AsPPB_CharSet_FunctionAPI() {
+PPB_CharSet_Proxy::AsCharSet_FunctionAPI() {
   return this;
 }
 
 char* PPB_CharSet_Proxy::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) {
   return ppapi::CharSetImpl::UTF16ToCharSet(
@@ skipping 37 matching lines @@
     PP_Instance instance,
     SerializedVarReturnValue result) {
   ppapi::thunk::EnterFunctionNoLock<ppapi::thunk::PPB_CharSet_FunctionAPI>
       enter(instance, true);
   if (enter.succeeded())
     result.Return(dispatcher(), enter.functions()->GetDefaultCharSet(instance));
 }
 
 }  // namespace proxy
 }  // namespace pp