PPAPI/NaCl: Fix leaky NaClIPCAdapter test.

chrome/nacl/nacl_ipc_adapter_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.
 
 #include "chrome/nacl/nacl_ipc_adapter.h"
 
 #include <string.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/simple_thread.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class NaClIPCAdapterTest : public testing::Test {
  public:
   NaClIPCAdapterTest() {}
 
   // testing::Test implementation.
   virtual void SetUp() OVERRIDE {
     sink_ = new IPC::TestSink;
 
-    // Takes ownership of the sink_ pointer.
+    // Takes ownership of the sink_ pointer. Note we provide the current message
+    // loop instead of using a real IO thread. This should work OK since we do
+    // not need real IPC for the tests.
     adapter_ = new NaClIPCAdapter(scoped_ptr<IPC::Channel>(sink_),
                                   base::MessageLoopProxy::current());
   }
   virtual void TearDown() OVERRIDE {
     sink_ = NULL;  // This pointer is actually owned by the IPCAdapter.
     adapter_ = NULL;
+    // The adapter destructor has to post a task to destroy the Channel on the
+    // IO thread. For the purposes of the test, we just need to make sure that
+    // task gets run, or it will appear as a leak.
+    message_loop_.RunAllPending();
   }
 
  protected:
   MessageLoop message_loop_;
 
   scoped_refptr<NaClIPCAdapter> adapter_;
 
   // Messages sent from nacl to the adapter end up here. Note that we create
   // this pointer and pass ownership of it to the IPC adapter, who will keep
   // it alive as long as the adapter is alive. This means that when the
@@ skipping 57 matching lines @@
   header->type = type;
   header->flags = 0;
   header->num_fds = 0;
   *reinterpret_cast<int*>(
       &buf[sizeof(NaClIPCAdapter::NaClMessageHeader)]) = value;
 
   int result = adapter_->Send(buf, buf_size);
   EXPECT_EQ(buf_size, result);
 
   // Check that the message came out the other end in the test sink
-  // (messages are posted to we have to pump).
+  // (messages are posted, so we have to pump).
   message_loop_.RunAllPending();
   ASSERT_EQ(1u, sink_->message_count());
   const IPC::Message* msg = sink_->GetMessageAt(0);
 
   EXPECT_EQ(sizeof(int), msg->payload_size());
   EXPECT_EQ(header->routing, msg->routing_id());
   EXPECT_EQ(header->type, msg->type());
 
   // Now test the partial send case. We should be able to break the message
   // into two parts and it should still work.
@@ skipping 158 matching lines @@
   EXPECT_EQ(-1, result);
 
   // Test the "previously had an error" case. BlockingReceive should return
   // immediately if there was an error.
   result = adapter_->BlockingReceive(buf, kBufSize);
   EXPECT_EQ(-1, result);
 
   thread.Join();
 }