Delete FunctionGroupBase from Pepper.

ppapi/thunk/enter.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/thunk/enter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
@@ skipping 49 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, RunWhileLocked(base::Bind(
       callback_.func, callback_.user_data, result)));
 
   // Now that the callback will be issued in the future, we should return
   // "pending" to the caller, and not issue the callback again.
   callback_ = PP_BlockUntilComplete();
   retval_ = PP_OK_COMPLETIONPENDING;
   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);
 }
 
 void EnterBase::SetStateForResourceError(PP_Resource pp_resource,
                                          Resource* resource_base,
                                          void* object,
                                          bool report_error) {
   if (object)
     return;  // Everything worked.
@@ skipping 52 matching lines @@
     message = base::StringPrintf(
         "0x%X is not a valid instance ID.",
         pp_instance);
     PpapiGlobals::Get()->BroadcastLogWithSource(0, PP_LOGLEVEL_ERROR,
                                                 std::string(), message);
   }
 }
 
 }  // 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