Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/resource_creation_proxy.h

 // Copyright (c) 2011 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_RESOURCE_CREATION_PROXY_H_
 #define PPAPI_PROXY_RESOURCE_CREATION_PROXY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "ipc/ipc_channel.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
-#include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/serialized_structs.h"
+#include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 struct PP_Size;
 
 namespace ppapi {
 
 class HostResource;
 
 namespace proxy {
 
 class Dispatcher;
 
-class ResourceCreationProxy : public InterfaceProxy,
-                              public thunk::ResourceCreationAPI {
+class ResourceCreationProxy : public FunctionGroupBase,
+                              public thunk::ResourceCreationAPI,
+                              public IPC::Channel::Listener,
+                              public IPC::Message::Sender {
  public:
   explicit ResourceCreationProxy(Dispatcher* dispatcher);
   virtual ~ResourceCreationProxy();
 
-  // Factory function used for registration (normal code can just use the
-  // constructor).
-  static InterfaceProxy* Create(Dispatcher* dispatcher);
-
   virtual thunk::ResourceCreationAPI* AsResourceCreationAPI() OVERRIDE;
 
   // ResourceCreationAPI (called in plugin).
   virtual PP_Resource CreateAudio(PP_Instance instance,
                                   PP_Resource config_id,
                                   PPB_Audio_Callback audio_callback,
                                   void* user_data) OVERRIDE;
   virtual PP_Resource CreateAudioConfig(PP_Instance instance,
                                         PP_AudioSampleRate sample_rate,
                                         uint32_t sample_frame_count) OVERRIDE;
@@ skipping 96 matching lines @@
                              PP_Bool is_always_opaque,
                              HostResource* result);
   void OnMsgCreateImageData(PP_Instance instance,
                             int32_t format,
                             const PP_Size& size,
                             PP_Bool init_to_zero,
                             HostResource* result,
                             std::string* image_data_desc,
                             ImageHandle* result_image_handle);
 
+  Dispatcher* dispatcher_;
+
   DISALLOW_COPY_AND_ASSIGN(ResourceCreationProxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_RESOURCE_CREATION_PROXY_H_