Fix ownership of the helper thread in IPCSyncChannelTest.SyncMessageFilter

ipc/ipc_sync_channel_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Unit test for SyncChannel.
 
 #include "ipc/ipc_sync_channel.h"
 
 #include <string>
 #include <vector>
@@ skipping 1068 matching lines @@
   workers.push_back(new SimpleClient());
   RunTest(workers);
 }
 
 //-----------------------------------------------------------------------------
 
 namespace {
 
 class TestSyncMessageFilter : public SyncMessageFilter {
  public:
-  TestSyncMessageFilter(base::WaitableEvent* shutdown_event, Worker* worker)
+  TestSyncMessageFilter(base::WaitableEvent* shutdown_event,
+                        Worker* worker,
+                        scoped_refptr<base::MessageLoopProxy> message_loop)
       : SyncMessageFilter(shutdown_event),
         worker_(worker),
-        thread_("helper_thread") {
-    base::Thread::Options options;
-    options.message_loop_type = MessageLoop::TYPE_DEFAULT;
-    thread_.StartWithOptions(options);
+        message_loop_(message_loop) {
   }
 
   virtual void OnFilterAdded(Channel* channel) {
     SyncMessageFilter::OnFilterAdded(channel);
-    thread_.message_loop()->PostTask(
+    message_loop_->PostTask(
         FROM_HERE,
         base::Bind(&TestSyncMessageFilter::SendMessageOnHelperThread, this));
   }
 
   void SendMessageOnHelperThread() {
     int answer = 0;
     bool result = Send(new SyncChannelTestMsg_AnswerToLife(&answer));
     DCHECK(result);
     DCHECK_EQ(answer, 42);
 
     worker_->Done();
   }
 
  private:
   virtual ~TestSyncMessageFilter() {}
 
   Worker* worker_;
-  base::Thread thread_;
+  scoped_refptr<base::MessageLoopProxy> message_loop_;
 };
 
 class SyncMessageFilterServer : public Worker {
  public:
   SyncMessageFilterServer()
-      : Worker(Channel::MODE_SERVER, "sync_message_filter_server") {
-    filter_ = new TestSyncMessageFilter(shutdown_event(), this);
+      : Worker(Channel::MODE_SERVER, "sync_message_filter_server"),
+        thread_("helper_thread") {
+    base::Thread::Options options;
+    options.message_loop_type = MessageLoop::TYPE_DEFAULT;
+    thread_.StartWithOptions(options);
+    filter_ = new TestSyncMessageFilter(shutdown_event(), this,
+                                        thread_.message_loop_proxy());
   }
 
   void Run() {
     channel()->AddFilter(filter_.get());
   }
 
+  base::Thread thread_;
   scoped_refptr<TestSyncMessageFilter> filter_;
 };
 
 // This class provides functionality to test the case that a Send on the sync
 // channel does not crash after the channel has been closed.
 class ServerSendAfterClose : public Worker {
  public:
   ServerSendAfterClose()
      : Worker(Channel::MODE_SERVER, "simpler_server"),
        send_result_(true) {
@@ skipping 809 matching lines @@
 
 }  // namespace
 
 // Windows needs to send an out-of-band secret to verify the client end of the
 // channel. Test that we still connect correctly in that case.
 TEST_F(IPCSyncChannelTest, Verified) {
   Verified();
 }
 
 }  // namespace IPC