Delete FunctionGroupBase from Pepper.

webkit/plugins/ppapi/host_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 WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
 #define WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
 
 #include "base/compiler_specific.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
@@ skipping 20 matching lines @@
   inline static HostGlobals* Get() {
     DCHECK(PpapiGlobals::Get()->IsHostGlobals());
     return static_cast<HostGlobals*>(PpapiGlobals::Get());
   }
 
   // PpapiGlobals implementation.
   virtual ::ppapi::ResourceTracker* GetResourceTracker() OVERRIDE;
   virtual ::ppapi::VarTracker* GetVarTracker() OVERRIDE;
   virtual ::ppapi::CallbackTracker* GetCallbackTrackerForInstance(
       PP_Instance instance) OVERRIDE;
-  virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
-      PP_Instance inst,
-      ::ppapi::ApiID id) OVERRIDE;
+  virtual ::ppapi::thunk::PPB_Instance_API* GetInstanceAPI(
+      PP_Instance instance) OVERRIDE;
+  virtual ::ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI(
+      PP_Instance instance) OVERRIDE;
   virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
   virtual std::string GetCmdLine() OVERRIDE;
   virtual void PreCacheFontForFlash(const void* logfontw) OVERRIDE;
   virtual base::Lock* GetProxyLock() OVERRIDE;
   virtual void LogWithSource(PP_Instance instance,
                              PP_LogLevel_Dev level,
                              const std::string& source,
                              const std::string& value) OVERRIDE;
   virtual void BroadcastLogWithSource(PP_Module module,
                                       PP_LogLevel_Dev level,
@@ skipping 32 matching lines @@
 
   // Returns a pointer to the plugin instance object associated with the given
   // instance handle. The return value will be NULL if the handle is invalid or
   // if the instance has crashed.
   WEBKIT_PLUGINS_EXPORT PluginInstance* GetInstance(PP_Instance instance);
 
  private:
   // PpapiGlobals overrides.
   virtual bool IsHostGlobals() const OVERRIDE;
 
-  // Per-instance data we track.
-  struct InstanceData;
-
   WEBKIT_PLUGINS_EXPORT static HostGlobals* host_globals_;
 
   ::ppapi::ResourceTracker resource_tracker_;
   HostVarTracker host_var_tracker_;
 
-  // Tracks all live instances and their associated data.
-  typedef std::map<PP_Instance, linked_ptr<InstanceData> > InstanceMap;
+  // Tracks all live instances and their associated object.
+  typedef std::map<PP_Instance, PluginInstance*> InstanceMap;
   InstanceMap instance_map_;
 
   // Tracks all live modules. The pointers are non-owning, the PluginModule
   // destructor will notify us when the module is deleted.
   typedef std::map<PP_Module, PluginModule*> ModuleMap;
   ModuleMap module_map_;
 
   DISALLOW_COPY_AND_ASSIGN(HostGlobals);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif   // WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_