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

ppapi/proxy/ppb_cursor_control_proxy.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 PPAPI_PPB_CURSOR_CONTROL_PROXY_H_
 #define PPAPI_PPB_CURSOR_CONTROL_PROXY_H_
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
@@ skipping 13 matching lines @@
     : public ppapi::FunctionGroupBase,
       public ppapi::thunk::PPB_CursorControl_FunctionAPI,
       public InterfaceProxy {
  public:
   PPB_CursorControl_Proxy(Dispatcher* dispatcher, const void* target_interface);
   virtual ~PPB_CursorControl_Proxy();
 
   static const Info* GetInfo();
 
   // FunctionGroupBase overrides.
-  ppapi::thunk::PPB_CursorControl_FunctionAPI* AsPPB_CursorControl_FunctionAPI()
+  ppapi::thunk::PPB_CursorControl_FunctionAPI* AsCursorControl_FunctionAPI()
       OVERRIDE;
 
   // PPB_CursorControl_FunctionAPI implementation.
   virtual PP_Bool SetCursor(PP_Instance instance,
                             PP_CursorType_Dev type,
                             PP_Resource custom_image_id,
                             const PP_Point* hot_spot) OVERRIDE;
   virtual PP_Bool LockCursor(PP_Instance instance) OVERRIDE;
   virtual PP_Bool UnlockCursor(PP_Instance instance) OVERRIDE;
   virtual PP_Bool HasCursorLock(PP_Instance instance) OVERRIDE;
@@ skipping 16 matching lines @@
   void OnMsgHasCursorLock(PP_Instance instance,
                           PP_Bool* result);
   void OnMsgCanLockCursor(PP_Instance instance,
                           PP_Bool* result);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PPB_CURSOR_CONTROL_PROXY_H_