Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1406)

Unified Diff: ppapi/proxy/ppapi_proxy_test.cc

Issue 589213003: PPAPI: Never re-enter JavaScript for PostMessage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup/fixes Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/ppapi_proxy_test.cc
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 81793d5c174239920d52c7458d7dc0843b258903..5da40044d19aff6729c81c66735ab1fe3c213d4e 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -12,6 +12,7 @@
#include "base/observer_list.h"
#include "base/run_loop.h"
#include "ipc/ipc_sync_channel.h"
+#include "ipc/message_filter.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_proxy_private.h"
#include "ppapi/proxy/ppapi_messages.h"
@@ -407,16 +408,8 @@ void PluginProxyMultiThreadTest::InternalSetUpTestOnSecondaryThread(
// HostProxyTestHarness --------------------------------------------------------
-class HostProxyTestHarness::MockSyncMessageStatusReceiver
- : public HostDispatcher::SyncMessageStatusReceiver {
- public:
- virtual void BeginBlockOnSyncMessage() OVERRIDE {}
- virtual void EndBlockOnSyncMessage() OVERRIDE {}
-};
-
HostProxyTestHarness::HostProxyTestHarness(GlobalsConfiguration globals_config)
- : globals_config_(globals_config),
- status_receiver_(new MockSyncMessageStatusReceiver) {
+ : globals_config_(globals_config) {
}
HostProxyTestHarness::~HostProxyTestHarness() {
@@ -437,7 +430,7 @@ void HostProxyTestHarness::SetUpHarness() {
host_dispatcher_.reset(new HostDispatcher(
pp_module(),
&MockGetInterface,
- status_receiver_.release(),
+ scoped_refptr<IPC::MessageFilter>(new IPC::MessageFilter()),
PpapiPermissions::AllPermissions()));
host_dispatcher_->InitWithTestSink(&sink());
HostDispatcher::SetForInstance(pp_instance(), host_dispatcher_.get());
@@ -456,7 +449,7 @@ void HostProxyTestHarness::SetUpHarnessWithChannel(
host_dispatcher_.reset(new HostDispatcher(
pp_module(),
&MockGetInterface,
- status_receiver_.release(),
+ scoped_refptr<IPC::MessageFilter>(new IPC::MessageFilter()),
PpapiPermissions::AllPermissions()));
ppapi::Preferences preferences;
host_dispatcher_->InitHostWithChannel(&delegate_mock_,

Powered by Google App Engine
This is Rietveld 408576698