summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppapi_proxy_test.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 16:23:36 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 16:23:36 +0000
commit368ca47678e6c2208bd1849e5c8ad6f954ff0989 (patch)
treef308afb5e2e1f77906b8bd5b0479903ac9c7f42b /ppapi/proxy/ppapi_proxy_test.cc
parent7b084b0f357f6a8a2cd4b58a56af234e7af063f5 (diff)
downloadchromium_src-368ca47678e6c2208bd1849e5c8ad6f954ff0989.zip
chromium_src-368ca47678e6c2208bd1849e5c8ad6f954ff0989.tar.gz
chromium_src-368ca47678e6c2208bd1849e5c8ad6f954ff0989.tar.bz2
Porting ppapi_tests framework to postMessage.
Some tests still rely on scripting, so we changed to using InstancePrivate (since scripting will disappear from Instance soon). Also use conditional compilation so that if compiled as untrusted with NaCl, the tests use Instance instead of InstancePrivate. This means that tests which rely on scripting aren't runnable in NaCl. I also added a gyp option: pepper_scripting. The default is that scripting is on in this CL, but it will make it easy to turn it off in local builds. Soon we'll switch the default to no scripting, and soon after we can remove the option entirely. BUG=82606 TEST=these tests Review URL: http://codereview.chromium.org/7312008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_proxy_test.cc')
-rw-r--r--ppapi/proxy/ppapi_proxy_test.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index c95ac4d..c8bb7eb 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -224,6 +224,7 @@ uint32 PluginProxyTestHarness::PluginDelegateMock::Register(
void PluginProxyTestHarness::PluginDelegateMock::Unregister(
uint32 plugin_dispatcher_id) {
}
+
// PluginProxyTest -------------------------------------------------------------
PluginProxyTest::PluginProxyTest() {