Pepper: always delete ResourceMessageFilter objects on the creation thread.

ppapi/host/resource_message_filter_unittest.cc

Index: ppapi/host/resource_message_filter_unittest.cc
diff --git a/ppapi/host/resource_message_filter_unittest.cc b/ppapi/host/resource_message_filter_unittest.cc
index 78fc23cf6b43bd34f712e881b1ba9cbe101445b4..e26d164c2f95543d2efc35954703943ee5e3d699 100644
--- a/ppapi/host/resource_message_filter_unittest.cc
+++ b/ppapi/host/resource_message_filter_unittest.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_message.h"
@@ -15,9 +18,6 @@
 
 namespace ppapi {
 namespace host {
-
-typedef testing::Test ResourceMessageFilterTest;
-
 namespace {
 
 base::WaitableEvent g_handler_completion(true, false);
@@ -141,61 +141,83 @@ class MyResourceFilter : public ResourceMessageFilter {
 
 }  // namespace
 
+class ResourceMessageFilterTest : public testing::Test {
+ public:
+  void TestHandleMessageImpl() {
+    base::Thread io_thread("test_io_thread");
+    ASSERT_TRUE(io_thread.Start());
+
+    base::Thread bg_thread1("test_background_thread1");
+    ASSERT_TRUE(bg_thread1.Start());
+    scoped_refptr<MyResourceFilter> filter1 =
+        new MyResourceFilter(io_thread, bg_thread1, MSG1_TYPE, REPLY_MSG1_TYPE);
+
+    base::Thread bg_thread2("test_background_thread2");
+    ASSERT_TRUE(bg_thread2.Start());
+    scoped_refptr<MyResourceFilter> filter2 =
+        new MyResourceFilter(io_thread, bg_thread2, MSG2_TYPE, REPLY_MSG2_TYPE);
+
+    PP_Instance instance = 12345;
+    PP_Resource resource = 67890;
+    MyResourceHost host(NULL, instance, resource, MSG3_TYPE, REPLY_MSG3_TYPE);
+    host.AddMessageFilter(filter1);
+    host.AddMessageFilter(filter2);
+
+    proxy::ResourceMessageCallParams params(resource, 1);
+    params.set_has_callback();
+    HostMessageContext context(params);
+    IPC::Message message1(0, MSG1_TYPE, IPC::Message::PRIORITY_NORMAL);
+    IPC::Message message2(0, MSG2_TYPE, IPC::Message::PRIORITY_NORMAL);
+    IPC::Message message3(0, MSG3_TYPE, IPC::Message::PRIORITY_NORMAL);
+
+    // Message 1 handled by the first filter.
+    host.HandleMessage(message1, &context);
+    g_handler_completion.Wait();
+    EXPECT_EQ(filter1->last_handled_msg().type(), message1.type());
+    EXPECT_EQ(filter1->last_message_loop(), bg_thread1.message_loop());
+    EXPECT_EQ(host.last_reply_msg().type(),
+              static_cast<uint32>(REPLY_MSG1_TYPE));
+    EXPECT_EQ(host.last_reply_message_loop(), io_thread.message_loop());
+    g_handler_completion.Reset();
+
+    // Message 2 handled by the second filter.
+    host.HandleMessage(message2, &context);
+    g_handler_completion.Wait();
+    EXPECT_EQ(filter2->last_handled_msg().type(), message2.type());
+    EXPECT_EQ(filter2->last_message_loop(), bg_thread2.message_loop());
+    EXPECT_EQ(host.last_reply_msg().type(),
+              static_cast<uint32>(REPLY_MSG2_TYPE));
+    EXPECT_EQ(host.last_reply_message_loop(), io_thread.message_loop());
+    g_handler_completion.Reset();
+
+    // Message 3 handled by the resource host.
+    host.HandleMessage(message3, &context);
+    EXPECT_EQ(host.last_handled_msg().type(), message3.type());
+    EXPECT_EQ(host.last_reply_msg().type(),
+              static_cast<uint32>(REPLY_MSG3_TYPE));
+
+    io_thread.Stop();
+    bg_thread1.Stop();
+    bg_thread2.Stop();
+  }
+};
+
 // Test that messages are filtered correctly and handlers are run on the correct
 // threads.
 TEST_F(ResourceMessageFilterTest, TestHandleMessage) {
-  base::Thread io_thread("test_io_thread");
-  ASSERT_TRUE(io_thread.Start());
-
-  base::Thread bg_thread1("test_background_thread1");
-  ASSERT_TRUE(bg_thread1.Start());
-  scoped_refptr<MyResourceFilter> filter1 =
-      new MyResourceFilter(io_thread, bg_thread1, MSG1_TYPE, REPLY_MSG1_TYPE);
-
-  base::Thread bg_thread2("test_background_thread2");
-  ASSERT_TRUE(bg_thread2.Start());
-  scoped_refptr<MyResourceFilter> filter2 =
-      new MyResourceFilter(io_thread, bg_thread2, MSG2_TYPE, REPLY_MSG2_TYPE);
-
-  PP_Instance instance = 12345;
-  PP_Resource resource = 67890;
-  MyResourceHost host(NULL, instance, resource, MSG3_TYPE, REPLY_MSG3_TYPE);
-  host.AddMessageFilter(filter1);
-  host.AddMessageFilter(filter2);
-
-  proxy::ResourceMessageCallParams params(resource, 1);
-  params.set_has_callback();
-  HostMessageContext context(params);
-  IPC::Message message1(0, MSG1_TYPE, IPC::Message::PRIORITY_NORMAL);
-  IPC::Message message2(0, MSG2_TYPE, IPC::Message::PRIORITY_NORMAL);
-  IPC::Message message3(0, MSG3_TYPE, IPC::Message::PRIORITY_NORMAL);
-
-  // Message 1 handled by the first filter.
-  host.HandleMessage(message1, &context);
-  g_handler_completion.Wait();
-  EXPECT_EQ(filter1->last_handled_msg().type(), message1.type());
-  EXPECT_EQ(filter1->last_message_loop(), bg_thread1.message_loop());
-  EXPECT_EQ(host.last_reply_msg().type(), static_cast<uint32>(REPLY_MSG1_TYPE));
-  EXPECT_EQ(host.last_reply_message_loop(), io_thread.message_loop());
-  g_handler_completion.Reset();
-
-  // Message 2 handled by the second filter.
-  host.HandleMessage(message2, &context);
-  g_handler_completion.Wait();
-  EXPECT_EQ(filter2->last_handled_msg().type(), message2.type());
-  EXPECT_EQ(filter2->last_message_loop(), bg_thread2.message_loop());
-  EXPECT_EQ(host.last_reply_msg().type(), static_cast<uint32>(REPLY_MSG2_TYPE));
-  EXPECT_EQ(host.last_reply_message_loop(), io_thread.message_loop());
-  g_handler_completion.Reset();
-
-  // Message 3 handled by the resource host.
-  host.HandleMessage(message3, &context);
-  EXPECT_EQ(host.last_handled_msg().type(), message3.type());
-  EXPECT_EQ(host.last_reply_msg().type(), static_cast<uint32>(REPLY_MSG3_TYPE));
-
-  io_thread.Stop();
-  bg_thread1.Stop();
-  bg_thread2.Stop();
+  // ResourceMessageFilter instances need to be created on a thread with message
+  // loop. Therefore, we create a message loop and run the testing logic as a
+  // task on it.
+  base::MessageLoop main_message_loop;
+
+  // It should be safe to use base::Unretained() because the object won't be
+  // destroyed before the task is run.
+  main_message_loop.PostTask(
+      FROM_HERE,
+      base::Bind(&ResourceMessageFilterTest::TestHandleMessageImpl,
+                 base::Unretained(this)));
+
+  base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace proxy