Delete FunctionGroupBase from Pepper.

ppapi/thunk/ppb_input_event_thunk.cc

 // Copyright (c) 2012 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/c/pp_errors.h"
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_input_event_api.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
-typedef EnterFunction<PPB_Instance_FunctionAPI> EnterInstance;
 typedef EnterResource<PPB_InputEvent_API> EnterInputEvent;
 
 // InputEvent ------------------------------------------------------------------
 
 int32_t RequestInputEvents(PP_Instance instance, uint32_t event_classes) {
-  EnterInstance enter(instance, true);
+  EnterInstance enter(instance);
   if (enter.failed())
     return enter.retval();
   return enter.functions()->RequestInputEvents(instance, event_classes);
 }
 
 int32_t RequestFilteringInputEvents(PP_Instance instance,
                                     uint32_t event_classes) {
-  EnterInstance enter(instance, true);
+  EnterInstance enter(instance);
   if (enter.failed())
     return enter.retval();
   return enter.functions()->RequestFilteringInputEvents(instance,
                                                         event_classes);
 }
 
 void ClearInputEventRequest(PP_Instance instance,
                             uint32_t event_classes) {
-  EnterInstance enter(instance, true);
+  EnterInstance enter(instance);
   if (enter.succeeded())
     enter.functions()->ClearInputEventRequest(instance, event_classes);
 }
 
 PP_Bool IsInputEvent(PP_Resource resource) {
   EnterInputEvent enter(resource, false);
   return enter.succeeded() ? PP_TRUE : PP_FALSE;
 }
 
 PP_InputEvent_Type GetType(PP_Resource event) {
@@ skipping 29 matching lines @@
 
 // Mouse -----------------------------------------------------------------------
 
 PP_Resource CreateMouseInputEvent1_0(PP_Instance instance,
                                      PP_InputEvent_Type type,
                                      PP_TimeTicks time_stamp,
                                      uint32_t modifiers,
                                      PP_InputEvent_MouseButton mouse_button,
                                      const PP_Point* mouse_position,
                                      int32_t click_count) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
+  EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
 
   PP_Point mouse_movement = PP_MakePoint(0, 0);
   return enter.functions()->CreateMouseInputEvent(instance, type, time_stamp,
                                                   modifiers, mouse_button,
                                                   mouse_position, click_count,
                                                   &mouse_movement);
 }
 
 PP_Resource CreateMouseInputEvent1_1(PP_Instance instance,
                                      PP_InputEvent_Type type,
                                      PP_TimeTicks time_stamp,
                                      uint32_t modifiers,
                                      PP_InputEvent_MouseButton mouse_button,
                                      const PP_Point* mouse_position,
                                      int32_t click_count,
                                      const PP_Point* mouse_movement) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
+  EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
   return enter.functions()->CreateMouseInputEvent(instance, type, time_stamp,
                                                   modifiers, mouse_button,
                                                   mouse_position, click_count,
                                                   mouse_movement);
 }
 
 PP_Bool IsMouseInputEvent(PP_Resource resource) {
   if (!IsInputEvent(resource))
@@ skipping 53 matching lines @@
 };
 
 // Wheel -----------------------------------------------------------------------
 
 PP_Resource CreateWheelInputEvent(PP_Instance instance,
                                   PP_TimeTicks time_stamp,
                                   uint32_t modifiers,
                                   const PP_FloatPoint* wheel_delta,
                                   const PP_FloatPoint* wheel_ticks,
                                   PP_Bool scroll_by_page) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
+  EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
   return enter.functions()->CreateWheelInputEvent(instance, time_stamp,
                                                   modifiers, wheel_delta,
                                                   wheel_ticks, scroll_by_page);
 }
 
 PP_Bool IsWheelInputEvent(PP_Resource resource) {
   if (!IsInputEvent(resource))
     return PP_FALSE;  // Prevent warning log in GetType.
@@ skipping 31 matching lines @@
 };
 
 // Keyboard --------------------------------------------------------------------
 
 PP_Resource CreateKeyboardInputEvent(PP_Instance instance,
                                      PP_InputEvent_Type type,
                                      PP_TimeTicks time_stamp,
                                      uint32_t modifiers,
                                      uint32_t key_code,
                                      struct PP_Var character_text) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
+  EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
   return enter.functions()->CreateKeyboardInputEvent(instance, type, time_stamp,
                                                      modifiers, key_code,
                                                      character_text);
 }
 
 PP_Bool IsKeyboardInputEvent(PP_Resource resource) {
   if (!IsInputEvent(resource))
     return PP_FALSE;  // Prevent warning log in GetType.
@@ skipping 130 matching lines @@
 const PPB_WheelInputEvent_1_0* GetPPB_WheelInputEvent_1_0_Thunk() {
   return &g_ppb_wheel_input_event_thunk;
 }
 
 const PPB_IMEInputEvent_Dev_0_1* GetPPB_IMEInputEvent_Dev_0_1_Thunk() {
   return &g_ppb_ime_input_event_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi