summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-30 16:39:55 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-30 16:39:55 +0000
commitfab5194cdc3d57b1aa253e8f18ea64ba141e9616 (patch)
treebc08f2b88a1b966408f031767d22c6ca503d3144 /ppapi/proxy
parent42f5c7ef330e266261387a0c49560b500f2f7e40 (diff)
downloadchromium_src-fab5194cdc3d57b1aa253e8f18ea64ba141e9616.zip
chromium_src-fab5194cdc3d57b1aa253e8f18ea64ba141e9616.tar.gz
chromium_src-fab5194cdc3d57b1aa253e8f18ea64ba141e9616.tar.bz2
Add means for running some tests only o-o-p. Add messaging non-main thread test.
BUG=92909 TEST=included Review URL: http://codereview.chromium.org/7648033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/plugin_dispatcher.cc1
-rw-r--r--ppapi/proxy/ppb_testing_proxy.cc7
2 files changed, 6 insertions, 2 deletions
diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc
index 7412462..58a1017 100644
--- a/ppapi/proxy/plugin_dispatcher.cc
+++ b/ppapi/proxy/plugin_dispatcher.cc
@@ -109,7 +109,6 @@ bool PluginDispatcher::IsPlugin() const {
}
bool PluginDispatcher::Send(IPC::Message* msg) {
- DCHECK(MessageLoop::current());
TRACE_EVENT2("ppapi proxy", "PluginDispatcher::Send",
"Class", IPC_MESSAGE_ID_CLASS(msg->type()),
"Line", IPC_MESSAGE_ID_LINE(msg->type()));
diff --git a/ppapi/proxy/ppb_testing_proxy.cc b/ppapi/proxy/ppb_testing_proxy.cc
index 942521c..564f68f 100644
--- a/ppapi/proxy/ppb_testing_proxy.cc
+++ b/ppapi/proxy/ppb_testing_proxy.cc
@@ -63,11 +63,16 @@ uint32_t GetLiveObjectsForInstance(PP_Instance instance_id) {
return result;
}
+PP_Bool IsOutOfProcess() {
+ return PP_TRUE;
+}
+
const PPB_Testing_Dev testing_interface = {
&ReadImageData,
&RunMessageLoop,
&QuitMessageLoop,
- &GetLiveObjectsForInstance
+ &GetLiveObjectsForInstance,
+ &IsOutOfProcess
};
InterfaceProxy* CreateTestingProxy(Dispatcher* dispatcher,