Fix a couple of ipc_channel_mojo_unittest failures.

ipc/mojo/ipc_channel_mojo_unittest.cc

 // Copyright 2014 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 "ipc/mojo/ipc_channel_mojo.h"
 
 #include "base/base_paths.h"
 #include "base/files/file.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 413 matching lines @@
 
   base::MessageLoop::current()->Run();
   this->channel()->Close();
 
   EXPECT_TRUE(WaitForClientShutdown());
   DestroyChannel();
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(IPCChannelMojoTestSendMessagePipeClient) {
   ListenerThatExpectsMessagePipe listener;
-  ChannelClient client(&listener, "IPCChannelMojoTestSendPlatformHandleClient");
+  ChannelClient client(&listener, "IPCChannelMojoTestSendMessagePipeClient");
   client.Connect();
   listener.set_sender(client.channel());
 
   base::MessageLoop::current()->Run();
 
   client.Close();
 
   return 0;
 }
 
 #if defined(OS_WIN)
 class IPCChannelMojoDeadHandleTest : public IPCChannelMojoTestBase {
  protected:
   virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
       const IPC::ChannelHandle& handle,
       base::TaskRunner* runner) override {
     host_.reset(new IPC::ChannelMojoHost(task_runner()));
     return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(),
                                                  handle);
   }
 
   virtual bool DidStartClient() override {
     IPCTestBase::DidStartClient();
     const base::ProcessHandle client = client_process().Handle();
     // Forces GetFileHandleForProcess() fail. It happens occasionally
     // in production, so we should exercise it somehow.
-    // TODO(morrita): figure out how to safely test this.
+    // TODO(morrita): figure out how to safely test this. See crbug.com/464109.
     // ::CloseHandle(client);
     host_->OnClientLaunched(client);
     return true;
   }
 
  private:
   scoped_ptr<IPC::ChannelMojoHost> host_;
 };
 
 TEST_F(IPCChannelMojoDeadHandleTest, InvalidClientHandle) {
   // Any client type is fine as it is going to be killed anyway.
   InitWithMojo("IPCChannelMojoTestDoNothingClient");
 
   // Set up IPC channel and start client.
   ListenerExpectingErrors listener;
   CreateChannel(&listener);
   ASSERT_TRUE(ConnectChannel());
 
   ASSERT_TRUE(StartClient());
   base::MessageLoop::current()->Run();
 
   this->channel()->Close();
 
-  // WaitForClientShutdown() fails as client_hanadle() is already
-  // closed.
-  EXPECT_FALSE(WaitForClientShutdown());
+  // TODO(morrita): We need CloseHandle() call in DidStartClient(),
+  // which has been disabled since crrev.com/843113003, to
+  // make this fail. See crbug.com/464109.
+  // EXPECT_FALSE(WaitForClientShutdown());
+  WaitForClientShutdown();
   EXPECT_TRUE(listener.has_error());
 
   DestroyChannel();
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(IPCChannelMojoTestDoNothingClient) {
   ListenerThatQuits listener;
   ChannelClient client(&listener, "IPCChannelMojoTestDoNothingClient");
   client.Connect();
 
@@ skipping 168 matching lines @@
   base::MessageLoop::current()->Run();
 
   client.Close();
 
   return 0;
 }
 
 #endif // OS_LINUX
 
 }  // namespace