Delete FunctionGroupBase from Pepper.

ppapi/proxy/plugin_dispatcher.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_PROXY_PLUGIN_DISPATCHER_H_
 #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process.h"
 #include "build/build_config.h"
 #include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/dispatcher.h"
-#include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
 
 namespace ppapi {
 
 struct Preferences;
 class Resource;
 
+namespace thunk {
+class PPB_Instance_API;
+class ResourceCreationAPI;
+}
+
 namespace proxy {
 
 // Used to keep track of per-instance data.
 struct InstanceData {
   InstanceData();
   ~InstanceData();
 
   ViewData view;
 
   PP_Bool flash_fullscreen;  // Used for PPB_FlashFullscreen.
@@ skipping 71 matching lines @@
 
   // Keeps track of which dispatcher to use for each instance, active instances
   // and tracks associated data like the current size.
   void DidCreateInstance(PP_Instance instance);
   void DidDestroyInstance(PP_Instance instance);
 
   // Gets the data for an existing instance, or NULL if the instance id doesn't
   // correspond to a known instance.
   InstanceData* GetInstanceData(PP_Instance instance);
 
+  // Returns the corresponding API. These are APIs not associated with a
+  // resource. Guaranteed non-NULL.
+  thunk::PPB_Instance_API* GetInstanceAPI();
+  thunk::ResourceCreationAPI* GetResourceCreationAPI();
+
   // Returns the Preferences.
   const Preferences& preferences() const { return preferences_; }
 
-  // Returns the "new-style" function API for the given interface ID, creating
-  // it if necessary.
-  // TODO(brettw) this is in progress. It should be merged with the target
-  // proxies so there is one list to consult.
-  FunctionGroupBase* GetFunctionAPI(ApiID id);
-
   uint32 plugin_dispatcher_id() const { return plugin_dispatcher_id_; }
 
  private:
   friend class PluginDispatcherTest;
 
   // Notifies all live instances that they're now closed. This is used when
   // a renderer crashes or some other error is received.
   void ForceFreeAllInstances();
 
   // IPC message handlers.
@@ skipping 19 matching lines @@
 
   uint32 plugin_dispatcher_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginDispatcher);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PLUGIN_DISPATCHER_H_