diff options
Diffstat (limited to 'ppapi/tests')
| -rw-r--r-- | ppapi/tests/DEPS | 1 | ||||
| -rw-r--r-- | ppapi/tests/all_cpp_includes.h | 6 | ||||
| -rw-r--r-- | ppapi/tests/test_flash.h | 2 | ||||
| -rw-r--r-- | ppapi/tests/test_paint_aggregator.cc | 2 | ||||
| -rw-r--r-- | ppapi/tests/test_transport.cc | 2 | ||||
| -rw-r--r-- | ppapi/tests/testing_instance.h | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/ppapi/tests/DEPS b/ppapi/tests/DEPS index d679198..e901f41 100644 --- a/ppapi/tests/DEPS +++ b/ppapi/tests/DEPS @@ -10,6 +10,7 @@ include_rules = [ "+ppapi/c", "+ppapi/cpp", "+ppapi/tests", + "+ppapi/utility", ] # checkdeps.py shouldn't check include paths for files in clang, which aren't # part of the chrome build. diff --git a/ppapi/tests/all_cpp_includes.h b/ppapi/tests/all_cpp_includes.h index ff408b0..8ba62a1 100644 --- a/ppapi/tests/all_cpp_includes.h +++ b/ppapi/tests/all_cpp_includes.h @@ -47,9 +47,6 @@ #include "ppapi/cpp/module.h" #include "ppapi/cpp/module_impl.h" #include "ppapi/cpp/mouse_lock.h" -#include "ppapi/cpp/non_thread_safe_ref_count.h" -#include "ppapi/cpp/paint_aggregator.h" -#include "ppapi/cpp/paint_manager.h" #include "ppapi/cpp/private/flash_fullscreen.h" #include "ppapi/cpp/private/instance_private.h" #include "ppapi/cpp/point.h" @@ -60,5 +57,8 @@ #include "ppapi/cpp/url_request_info.h" #include "ppapi/cpp/url_response_info.h" #include "ppapi/cpp/var.h" +#include "ppapi/utility/graphics/paint_aggregator.h" +#include "ppapi/utility/graphics/paint_manager.h" +#include "ppapi/utility/non_thread_safe_ref_count.h" #endif // PPAPI_TESTS_ALL_CPP_INCLUDES_H_ diff --git a/ppapi/tests/test_flash.h b/ppapi/tests/test_flash.h index 39c4598..fba35ee 100644 --- a/ppapi/tests/test_flash.h +++ b/ppapi/tests/test_flash.h @@ -7,10 +7,10 @@ #include <string> -#include "ppapi/cpp/completion_callback.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/private/ppb_flash.h" #include "ppapi/tests/test_case.h" +#include "ppapi/utility/completion_callback_factory.h" class TestFlash : public TestCase { public: diff --git a/ppapi/tests/test_paint_aggregator.cc b/ppapi/tests/test_paint_aggregator.cc index 77e2174..a04cff8 100644 --- a/ppapi/tests/test_paint_aggregator.cc +++ b/ppapi/tests/test_paint_aggregator.cc @@ -4,8 +4,8 @@ #include "ppapi/tests/test_paint_aggregator.h" -#include "ppapi/cpp/paint_aggregator.h" #include "ppapi/tests/testing_instance.h" +#include "ppapi/utility/graphics/paint_aggregator.h" REGISTER_TEST_CASE(PaintAggregator); diff --git a/ppapi/tests/test_transport.cc b/ppapi/tests/test_transport.cc index 52d072e..7970050 100644 --- a/ppapi/tests/test_transport.cc +++ b/ppapi/tests/test_transport.cc @@ -13,13 +13,13 @@ #include "ppapi/c/dev/ppb_testing_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_macros.h" -#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/dev/transport_dev.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/var.h" #include "ppapi/tests/test_utils.h" #include "ppapi/tests/testing_instance.h" +#include "ppapi/utility/completion_callback_factory.h" REGISTER_TEST_CASE(Transport); diff --git a/ppapi/tests/testing_instance.h b/ppapi/tests/testing_instance.h index 74934a7..7b05174 100644 --- a/ppapi/tests/testing_instance.h +++ b/ppapi/tests/testing_instance.h @@ -7,7 +7,7 @@ #include <string> -#include "ppapi/cpp/completion_callback.h" +#include "ppapi/utility/completion_callback_factory.h" #if defined(__native_client__) #include "ppapi/cpp/instance.h" |