PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/proxy/ppb_image_data_proxy.h

Index: ppapi/proxy/ppb_image_data_proxy.h
diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h
index ee80cc05f9bc477409632e8b24f4e439e3855f4c..9d828863451282c66476a54c6c12e081c6aaef83 100644
--- a/ppapi/proxy/ppb_image_data_proxy.h
+++ b/ppapi/proxy/ppb_image_data_proxy.h
@@ -33,7 +33,7 @@ class ImageData : public ppapi::Resource,
                   public ppapi::thunk::PPB_ImageData_API,
                   public ppapi::PPB_ImageData_Shared {
  public:
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
   ImageData(const ppapi::HostResource& resource,
             const PP_ImageDataDesc& desc,
             ImageHandle handle);
@@ -61,7 +61,7 @@ class ImageData : public ppapi::Resource,
 
   const PP_ImageDataDesc& desc() const { return desc_; }
 
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
   static ImageHandle NullHandle();
   static ImageHandle HandleFromInt(int32_t i);
 #endif
@@ -69,7 +69,7 @@ class ImageData : public ppapi::Resource,
  private:
   PP_ImageDataDesc desc_;
 
-#if defined(OS_NACL)
+#if defined(OS_NACL) || defined(NACL_WIN64)
   base::SharedMemory shm_;
   uint32 size_;
   int map_count_;
@@ -113,7 +113,7 @@ class PPB_ImageData_Proxy : public InterfaceProxy {
                            PP_Bool init_to_zero,
                            HostResource* result,
                            std::string* image_data_desc,
-                           base::SharedMemoryHandle* result_image_handle);
+                           ppapi::proxy::SerializedHandle* result_image_handle);
 
   DISALLOW_COPY_AND_ASSIGN(PPB_ImageData_Proxy);
 };