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

ppapi/proxy/ppb_cursor_control_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_cursor_control_proxy.h"
 
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
@@ skipping 31 matching lines @@
     ppapi::thunk::GetPPB_CursorControl_Thunk(),
     PPB_CURSOR_CONTROL_DEV_INTERFACE,
     INTERFACE_ID_PPB_CURSORCONTROL,
     false,
     &CreateCursorControlProxy,
   };
   return &info;
 }
 
 ppapi::thunk::PPB_CursorControl_FunctionAPI*
-PPB_CursorControl_Proxy::AsPPB_CursorControl_FunctionAPI() {
+PPB_CursorControl_Proxy::AsCursorControl_FunctionAPI() {
   return this;
 }
 
 PP_Bool PPB_CursorControl_Proxy::SetCursor(PP_Instance instance,
                                            PP_CursorType_Dev type,
                                            PP_Resource custom_image_id,
                                            const PP_Point* hot_spot) {
   // It's legal for the image ID to be null if the type is not custom.
   HostResource cursor_image_resource;
   if (type == PP_CURSORTYPE_CUSTOM) {
@@ skipping 99 matching lines @@
 
 void PPB_CursorControl_Proxy::OnMsgCanLockCursor(PP_Instance instance,
                                                  PP_Bool* result) {
   EnterFunctionNoLock<PPB_CursorControl_FunctionAPI> enter(instance, true);
   if (enter.succeeded())
     *result = enter.functions()->CanLockCursor(instance);
 }
 
 }  // namespace proxy
 }  // namespace pp