Proxy PPB_Input_Event, PPP_Input_Event, and associated IFs.

src/shared/ppapi_proxy/browser_ppp_instance.cc

Index: src/shared/ppapi_proxy/browser_ppp_instance.cc
diff --git a/src/shared/ppapi_proxy/browser_ppp_instance.cc b/src/shared/ppapi_proxy/browser_ppp_instance.cc
index 13591c092f0d1f5b77315987c5443c1cef84217b..427cb1e84a40ed21029766bc5cc423881b565faa 100644
--- a/src/shared/ppapi_proxy/browser_ppp_instance.cc
+++ b/src/shared/ppapi_proxy/browser_ppp_instance.cc
@@ -8,20 +8,18 @@
 #include <string.h>
 #include <limits>
 
-// Include file order cannot be observed because ppp_instance declares a
-// structure return type that causes an error on Windows.
-// TODO(sehr, brettw): fix the return types and include order in PPAPI.
-#include "native_client/src/third_party/ppapi/c/pp_input_event.h"
-#include "native_client/src/third_party/ppapi/c/pp_resource.h"
-#include "native_client/src/third_party/ppapi/c/pp_var.h"
-#include "native_client/src/third_party/ppapi/c/ppp_instance.h"
-#include "srpcgen/ppp_rpc.h"
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/shared/ppapi_proxy/browser_globals.h"
 #include "native_client/src/shared/ppapi_proxy/browser_ppp.h"
+#include "native_client/src/shared/ppapi_proxy/browser_ppp_input_event.h"
+#include "native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppp_rpc.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
+#include "native_client/src/third_party/ppapi/c/pp_input_event.h"
+#include "native_client/src/third_party/ppapi/c/pp_resource.h"
+#include "native_client/src/third_party/ppapi/c/pp_var.h"
+#include "native_client/src/third_party/ppapi/c/ppp_instance.h"
 
 using nacl::scoped_array;