Revert r100853, 100851. Win_shared build is broken.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100854 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h
index 1db9164..0f1589b 100644
--- a/ppapi/proxy/resource_creation_proxy.h
+++ b/ppapi/proxy/resource_creation_proxy.h
@@ -11,8 +11,8 @@
 #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;
@@ -25,16 +25,14 @@ 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).
@@ -151,6 +149,8 @@ class ResourceCreationProxy : public InterfaceProxy,
                             std::string* image_data_desc,
                             ImageHandle* result_image_handle);
 
+  Dispatcher* dispatcher_;
+
   DISALLOW_COPY_AND_ASSIGN(ResourceCreationProxy);
 };