Connect PPAPI IPC channels for non-SFI mode.

ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h

Index: ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h b/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
index c7fe8a0187751d5407ce011f3057da522f09e0b2..2d5f677ab07e93088294d3b3c8dbf3d84242e35d 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
@@ -7,10 +7,14 @@
 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
 
+#if defined(__native_client__)
 #include "native_client/src/include/portability.h"
+#endif
 #include "ppapi/nacl_irt/irt_ppapi.h"
 
-EXTERN_C_BEGIN
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 // The entry point for the main thread of the PPAPI plugin process.
 int PpapiPluginMain(void);
@@ -18,6 +22,28 @@ int PpapiPluginMain(void);
 void PpapiPluginRegisterThreadCreator(
     const struct PP_ThreadFunctions* new_funcs);
 
-EXTERN_C_END
+#ifdef __cplusplus
+}
+#endif
+
+#if !defined(__native_client__)
+// For non-SFI mode, we expose two more functions, assuming this is compiled
+// with c++ compiler.
+
+namespace ppapi {
+namespace proxy {

[dmichael (off chromium), 2014/02/13 19:00:34]

This feels weird to reference ppapi::proxy at all here... this should use a
different namespace, I think.

Would it make sense to instead declare these somewhere in ppapi/nacl_irt? I'm
not clear yet on what that directory is for.

[Mark Seaborn, 2014/02/14 01:55:36]

I intended ppapi/nacl_irt/ to be used just for public headers that define NaCl's
stable ABI, not for anything else.  So it's similar to ppapi/c/.

[hidehiko, 2014/02/14 10:49:05]

Reverted this file. See also my reply to plugin_main.cc

+
+// Overwrites the IPC channels for the browser and the renderer by the given
+// FD #s.
+void SetIPCFileDescriptors(int browser_ipc_fd, int renderer_ipc_fd);
+
+// Waits for the initialization of the dispatchers for the PPAPI IPC channels.
+void WaitForPpapiStartEvent();
+
+}  // namespace proxy
+}  // namespace ppapi
+
+#endif
+
 
 #endif  // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_