Delete FunctionGroupBase from Pepper.

ppapi/thunk/enter.cc

Index: ppapi/thunk/enter.cc
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc
index 6b2208ae6684b2927378c6ac1f9e0ac9ef3ddc8e..a5117118c2e41f06a202fa5057d196cd84337e61 100644
--- a/ppapi/thunk/enter.cc
+++ b/ppapi/thunk/enter.cc
@@ -67,11 +67,6 @@ int32_t EnterBase::SetResult(int32_t result) {
   return retval_;
 }
 
-FunctionGroupBase* EnterBase::GetFunctions(PP_Instance instance,
-                                           ApiID id) const {
-  return PpapiGlobals::Get()->GetFunctionAPI(instance, id);
-}
-
 Resource* EnterBase::GetResource(PP_Resource resource) const {
   return PpapiGlobals::Get()->GetResourceTracker()->GetResource(resource);
 }
@@ -144,31 +139,48 @@ void EnterBase::SetStateForFunctionError(PP_Instance pp_instance,
 
 }  // namespace subtle
 
-EnterResourceCreation::EnterResourceCreation(PP_Instance instance)
-    : EnterFunction<ResourceCreationAPI>(instance, true) {
-}
-
-EnterResourceCreation::~EnterResourceCreation() {
-}
-
 EnterInstance::EnterInstance(PP_Instance instance)
-    : EnterFunction<PPB_Instance_FunctionAPI>(instance, true) {
+    : EnterBase(),
+      functions_(PpapiGlobals::Get()->GetInstanceAPI(instance)) {
+  SetStateForFunctionError(instance, functions_, true);
 }
 
 EnterInstance::EnterInstance(PP_Instance instance,
                              const PP_CompletionCallback& callback)
-    : EnterFunction<PPB_Instance_FunctionAPI>(instance, callback, true) {
+    : EnterBase(callback),
+      functions_(PpapiGlobals::Get()->GetInstanceAPI(instance)) {
+  SetStateForFunctionError(instance, functions_, true);
 }
 
 EnterInstance::~EnterInstance() {
 }
 
 EnterInstanceNoLock::EnterInstanceNoLock(PP_Instance instance)
-    : EnterFunctionNoLock<PPB_Instance_FunctionAPI>(instance, true) {
+    : EnterBase(),
+      functions_(PpapiGlobals::Get()->GetInstanceAPI(instance)) {
+  SetStateForFunctionError(instance, functions_, true);
 }
 
 EnterInstanceNoLock::~EnterInstanceNoLock() {
 }
 
+EnterResourceCreation::EnterResourceCreation(PP_Instance instance)
+    : EnterBase(),
+      functions_(PpapiGlobals::Get()->GetResourceCreationAPI(instance)) {
+  SetStateForFunctionError(instance, functions_, true);
+}
+
+EnterResourceCreation::~EnterResourceCreation() {
+}
+
+EnterResourceCreationNoLock::EnterResourceCreationNoLock(PP_Instance instance)
+    : EnterBase(),
+      functions_(PpapiGlobals::Get()->GetResourceCreationAPI(instance)) {
+  SetStateForFunctionError(instance, functions_, true);
+}
+
+EnterResourceCreationNoLock::~EnterResourceCreationNoLock() {
+}
+
 }  // namespace thunk
 }  // namespace ppapi