summaryrefslogtreecommitdiffstats
path: root/ppapi/tests
diff options
context:
space:
mode:
authornfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 01:35:50 +0000
committernfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 01:35:50 +0000
commit56e8cc35efd400a3c38a8d459dff06bd20e9e899 (patch)
tree8333c74ebf20d17930caff775d28c9be9d1e8849 /ppapi/tests
parentf76f2689acac6ec1fd8e39f9a5cf46749e3c1834 (diff)
downloadchromium_src-56e8cc35efd400a3c38a8d459dff06bd20e9e899.zip
chromium_src-56e8cc35efd400a3c38a8d459dff06bd20e9e899.tar.gz
chromium_src-56e8cc35efd400a3c38a8d459dff06bd20e9e899.tar.bz2
Remove dev/audio, dev/audio_config, and dev/audio_trusted
Also, bump NaCl in deps to pull in new version of NaCl, which has now migrated to non-dev audio. Review URL: http://codereview.chromium.org/6281007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests')
-rw-r--r--ppapi/tests/all_c_includes.h6
-rw-r--r--ppapi/tests/all_cpp_includes.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h
index fde2c02..208c362 100644
--- a/ppapi/tests/all_c_includes.h
+++ b/ppapi/tests/all_c_includes.h
@@ -13,9 +13,6 @@
#include "ppapi/c/dev/pp_file_info_dev.h"
#include "ppapi/c/dev/pp_graphics_3d_dev.h"
#include "ppapi/c/dev/pp_video_dev.h"
-#include "ppapi/c/dev/ppb_audio_config_dev.h"
-#include "ppapi/c/dev/ppb_audio_dev.h"
-#include "ppapi/c/dev/ppb_audio_trusted_dev.h"
#include "ppapi/c/dev/ppb_buffer_dev.h"
#include "ppapi/c/dev/ppb_char_set_dev.h"
#include "ppapi/c/dev/ppb_context_3d_dev.h"
@@ -64,6 +61,8 @@
#include "ppapi/c/pp_time.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb.h"
+#include "ppapi/c/ppb_audio.h"
+#include "ppapi/c/ppb_audio_config.h"
#include "ppapi/c/ppb_class.h"
#include "ppapi/c/ppb_core.h"
#include "ppapi/c/ppb_graphics_2d.h"
@@ -75,6 +74,7 @@
#include "ppapi/c/ppb_var.h"
#include "ppapi/c/ppp.h"
#include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/trusted/ppb_audio_trusted.h"
#include "ppapi/c/trusted/ppb_image_data_trusted.h"
#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
diff --git a/ppapi/tests/all_cpp_includes.h b/ppapi/tests/all_cpp_includes.h
index c835195..5860f65 100644
--- a/ppapi/tests/all_cpp_includes.h
+++ b/ppapi/tests/all_cpp_includes.h
@@ -8,11 +8,11 @@
#ifndef PPAPI_TESTS_ALL_CPP_INCLUDES_H_
#define PPAPI_TESTS_ALL_CPP_INCLUDES_H_
+#include "ppapi/cpp/audio.h"
+#include "ppapi/cpp/audio_config.h"
#include "ppapi/cpp/common.h"
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/cpp/core.h"
-#include "ppapi/cpp/dev/audio_config_dev.h"
-#include "ppapi/cpp/dev/audio_dev.h"
#include "ppapi/cpp/dev/buffer_dev.h"
#include "ppapi/cpp/dev/context_3d_dev.h"
#include "ppapi/cpp/dev/directory_entry_dev.h"