summaryrefslogtreecommitdiffstats
path: root/ppapi/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi/tests')
-rw-r--r--ppapi/tests/all_cpp_includes.h5
-rw-r--r--ppapi/tests/testing_instance.h5
2 files changed, 9 insertions, 1 deletions
diff --git a/ppapi/tests/all_cpp_includes.h b/ppapi/tests/all_cpp_includes.h
index 6abe681..a85fa03 100644
--- a/ppapi/tests/all_cpp_includes.h
+++ b/ppapi/tests/all_cpp_includes.h
@@ -66,8 +66,11 @@
#include "ppapi/cpp/var.h"
#include "ppapi/cpp/var_array_buffer.h"
#include "ppapi/cpp/websocket.h"
+#include "ppapi/utility/completion_callback_factory.h"
+#include "ppapi/utility/completion_callback_factory_thread_traits.h"
#include "ppapi/utility/graphics/paint_aggregator.h"
#include "ppapi/utility/graphics/paint_manager.h"
-#include "ppapi/utility/non_thread_safe_ref_count.h"
+#include "ppapi/utility/threading/lock.h"
+#include "ppapi/utility/threading/simple_thread.h"
#endif // PPAPI_TESTS_ALL_CPP_INCLUDES_H_
diff --git a/ppapi/tests/testing_instance.h b/ppapi/tests/testing_instance.h
index 1b2acbf..33ed21c 100644
--- a/ppapi/tests/testing_instance.h
+++ b/ppapi/tests/testing_instance.h
@@ -15,6 +15,11 @@
#include "ppapi/cpp/private/instance_private.h"
#endif
+// Windows defines 'PostMessage', so we have to undef it.
+#ifdef PostMessage
+#undef PostMessage
+#endif
+
class TestCase;
// How signaling works: