summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/plugin_dispatcher_unittest.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-27 20:28:18 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-27 20:28:18 +0000
commit246fc49935cd37deba43624861f236acc016aa48 (patch)
tree8dbc89fc8304cfa0409dc83ccb8b94b01d3def8f /ppapi/proxy/plugin_dispatcher_unittest.cc
parent906960ba1d7a27bb458fca480a20aa33c61ebdb6 (diff)
downloadchromium_src-246fc49935cd37deba43624861f236acc016aa48.zip
chromium_src-246fc49935cd37deba43624861f236acc016aa48.tar.gz
chromium_src-246fc49935cd37deba43624861f236acc016aa48.tar.bz2
PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally
This does a couple of things: - It defines a new wrapper for passing any kind of handle through the PPAPI proxy (SerializedHandle). - It updates nacl_ipc_adapter to have a more general way to pick apart messages based on their static types (which include the types of all the params). - It adds support for PPB_Graphics2D and PPB_Graphics3D to the NaCl IPC proxy (e.g., NaCl SDK examples pi_generator and tumbler work in the new proxy with this patch). The downside is it requires pulling parts of ppapi/shared_impl and ppapi/proxy in to the NaCl Win64 build. BUG=116317 TEST= Review URL: https://chromiumcodereview.appspot.com/10828023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_dispatcher_unittest.cc')
-rw-r--r--ppapi/proxy/plugin_dispatcher_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/ppapi/proxy/plugin_dispatcher_unittest.cc b/ppapi/proxy/plugin_dispatcher_unittest.cc
index a2999d0..821ecad 100644
--- a/ppapi/proxy/plugin_dispatcher_unittest.cc
+++ b/ppapi/proxy/plugin_dispatcher_unittest.cc
@@ -74,7 +74,10 @@ TEST_F(PluginDispatcherTest, PPBCreation) {
EXPECT_FALSE(HasTargetProxy(API_ID_PPB_AUDIO));
PpapiMsg_PPBAudio_NotifyAudioStreamCreated audio_msg(
API_ID_PPB_AUDIO, HostResource(), 0,
- IPC::PlatformFileForTransit(), base::SharedMemoryHandle(), 0);
+ ppapi::proxy::SerializedHandle(
+ ppapi::proxy::SerializedHandle::SOCKET),
+ ppapi::proxy::SerializedHandle(
+ ppapi::proxy::SerializedHandle::SHARED_MEMORY));
plugin_dispatcher()->OnMessageReceived(audio_msg);
EXPECT_TRUE(HasTargetProxy(API_ID_PPB_AUDIO));
}