PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/shared_impl/ppb_image_data_shared.cc

Index: ppapi/shared_impl/ppb_image_data_shared.cc
diff --git a/ppapi/shared_impl/ppb_image_data_shared.cc b/ppapi/shared_impl/ppb_image_data_shared.cc
index deec2ac37beb7ce0b0f5486821083847abfdf085..abdea60e270f633b89afdc3c3ffe0147c97f3dd1 100644
--- a/ppapi/shared_impl/ppb_image_data_shared.cc
+++ b/ppapi/shared_impl/ppb_image_data_shared.cc
@@ -4,9 +4,10 @@
 
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 
+#include "base/logging.h"
 #include "build/build_config.h"
 
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
 #include "third_party/skia/include/core/SkTypes.h"
 #endif
 
@@ -14,18 +15,23 @@ namespace ppapi {
 
 // static
 PP_ImageDataFormat PPB_ImageData_Shared::GetNativeImageDataFormat() {
-#if !defined(OS_NACL)
-  if (SK_B32_SHIFT == 0)
+#if defined(OS_NACL)
+  // In NaCl, just default to something. If we're wrong, it will be converted
+  // later.
+  // TODO(dmichael): Really proxy this.
+  return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
+#elif defined(NACL_WIN64)
+  // In the NaCl Win64 helper, this shouldn't be called. If we start building
+  // Chrome on Windows 64 for realz, we should really implement this.
+  NOTIMPLEMENTED();
+  return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
+#else
+  return PP_IMAGEDATAFORMAT_BGRA_PREMUL;  if (SK_B32_SHIFT == 0)
     return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
   else if (SK_R32_SHIFT == 0)
     return PP_IMAGEDATAFORMAT_RGBA_PREMUL;
   else
     return PP_IMAGEDATAFORMAT_BGRA_PREMUL;  // Default to something on failure.
-#else
-  // In NaCl, just default to something. If we're wrong, it will be converted
-  // later.
-  // TODO(dmichael): Really proxy this.
-  return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
 #endif
 }