Index: src/trusted/plugin/srpc_client.cc |
=================================================================== |
--- src/trusted/plugin/srpc_client.cc (revision 2712) |
+++ src/trusted/plugin/srpc_client.cc (working copy) |
@@ -10,15 +10,14 @@ |
#include <map> |
#include "native_client/src/shared/platform/nacl_log.h" |
-#include "native_client/src/shared/npruntime/npmodule.h" |
+#include "native_client/src/trusted/plugin/browser_interface.h" |
+#include "native_client/src/trusted/plugin/connected_socket.h" |
+#include "native_client/src/trusted/plugin/desc_based_handle.h" |
+#include "native_client/src/trusted/plugin/plugin.h" |
+#include "native_client/src/trusted/plugin/scriptable_handle.h" |
+#include "native_client/src/trusted/plugin/srpc_client.h" |
+#include "native_client/src/trusted/plugin/utility.h" |
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h" |
-#include "native_client/src/trusted/plugin/srpc/connected_socket.h" |
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h" |
-#include "native_client/src/trusted/plugin/srpc/srpc_client.h" |
-#include "native_client/src/trusted/plugin/srpc/utility.h" |
-#include "native_client/src/trusted/plugin/srpc/desc_based_handle.h" |
- |
namespace { |
// TODO(sehr): again, not reentrant. See bug 605. |
Property changes on: src/trusted/plugin/srpc_client.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |