Delete FunctionGroupBase from Pepper.

ppapi/shared_impl/ppapi_globals.h

 // 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.
 
 #ifndef PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_
 #define PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/threading/thread_local.h"  // For testing purposes only.
 #include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/shared_impl/api_id.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace base {
 class Lock;
 }
 
 namespace ppapi {
 
 class CallbackTracker;
-class FunctionGroupBase;
 class ResourceTracker;
 class VarTracker;
 
+namespace thunk {
+class PPB_Instance_API;
+class ResourceCreationAPI;
+}
+
 // Abstract base class
 class PPAPI_SHARED_EXPORT PpapiGlobals {
  public:
   PpapiGlobals();
 
   // This constructor is to be used only for making a PpapiGlobal for testing
   // purposes. This avoids setting the global static ppapi_globals_. For unit
   // tests that use this feature, the "test" PpapiGlobals should be constructed
   // using this method. See SetPpapiGlobalsOnThreadForTest for more information.
   struct ForTest {};
@@ skipping 41 matching lines @@
   // log errors for things like bad resource IDs where we may not have an
   // associated instance.
   //
   // Note that in the plugin process, the module parameter is ignored since
   // there is only one possible one.
   virtual void BroadcastLogWithSource(PP_Module module,
                                       PP_LogLevel_Dev level,
                                       const std::string& source,
                                       const std::string& value) = 0;
 
-  // Returns the function object corresponding to the given ID, or NULL if
-  // there isn't one.
-  virtual FunctionGroupBase* GetFunctionAPI(PP_Instance inst, ApiID id) = 0;
+  // Returns the given API object associated with the given instance, or NULL
+  // if the instance is invalid.
+  virtual thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) = 0;
+  virtual thunk::ResourceCreationAPI* GetResourceCreationAPI(
+      PP_Instance instance) = 0;
 
   // Returns the PP_Module associated with the given PP_Instance, or 0 on
   // failure.
   virtual PP_Module GetModuleForInstance(PP_Instance instance) = 0;
 
   // Returns the command line for the process.
   virtual std::string GetCmdLine() = 0;
 
   // Preloads the font on Windows, does nothing on other platforms.
   // TODO(brettw) remove this by passing the instance into the API so we don't
@@ skipping 10 matching lines @@
   static PpapiGlobals* GetThreadLocalPointer();
 
   static PpapiGlobals* ppapi_globals_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiGlobals);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_