Revert of Support early associated interface binding on ChannelMojo

ipc/ipc_mojo_bootstrap_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/ipc_mojo_bootstrap.h"
 
 #include <stdint.h>
 #include <memory>
 
 #include "base/base_paths.h"
@@ skipping 17 matching lines @@
 class IPCMojoBootstrapTest : public testing::Test {
  protected:
   mojo::edk::test::MultiprocessTestHelper helper_;
 };
 
 class TestingDelegate : public IPC::MojoBootstrap::Delegate {
  public:
   explicit TestingDelegate(const base::Closure& quit_callback)
       : passed_(false), quit_callback_(quit_callback) {}
 
-  void OnPipesAvailable(
-      IPC::mojom::ChannelAssociatedPtr sender,
-      IPC::mojom::ChannelAssociatedRequest receiver) override;
+  void OnPipesAvailable(IPC::mojom::ChannelAssociatedPtrInfo send_channel,
+                        IPC::mojom::ChannelAssociatedRequest receive_channel,
+                        int32_t peer_pid) override;
+  void OnBootstrapError() override;
 
   bool passed() const { return passed_; }
 
  private:
   bool passed_;
   const base::Closure quit_callback_;
 };
 
 void TestingDelegate::OnPipesAvailable(
-    IPC::mojom::ChannelAssociatedPtr sender,
-    IPC::mojom::ChannelAssociatedRequest receiver) {
+    IPC::mojom::ChannelAssociatedPtrInfo send_channel,
+    IPC::mojom::ChannelAssociatedRequest receive_channel,
+    int32_t peer_pid) {
   passed_ = true;
   quit_callback_.Run();
 }
 
+void TestingDelegate::OnBootstrapError() {
+  quit_callback_.Run();
+}
+
 TEST_F(IPCMojoBootstrapTest, Connect) {
   base::MessageLoop message_loop;
   base::RunLoop run_loop;
   TestingDelegate delegate(run_loop.QuitClosure());
   std::unique_ptr<IPC::MojoBootstrap> bootstrap = IPC::MojoBootstrap::Create(
       helper_.StartChild("IPCMojoBootstrapTestClient"),
-      IPC::Channel::MODE_SERVER, &delegate,
-      base::ThreadTaskRunnerHandle::Get());
+      IPC::Channel::MODE_SERVER, &delegate);
 
   bootstrap->Connect();
   run_loop.Run();
 
   EXPECT_TRUE(delegate.passed());
   EXPECT_TRUE(helper_.WaitForChildTestShutdown());
 }
 
 // A long running process that connects to us.
 MULTIPROCESS_TEST_MAIN_WITH_SETUP(
     IPCMojoBootstrapTestClientTestChildMain,
     ::mojo::edk::test::MultiprocessTestHelper::ChildSetup) {
   base::MessageLoop message_loop;
   base::RunLoop run_loop;
   TestingDelegate delegate(run_loop.QuitClosure());
   std::unique_ptr<IPC::MojoBootstrap> bootstrap = IPC::MojoBootstrap::Create(
       mojo::edk::CreateChildMessagePipe(
           mojo::edk::test::MultiprocessTestHelper::primordial_pipe_token),
-      IPC::Channel::MODE_CLIENT, &delegate,
-      base::ThreadTaskRunnerHandle::Get());
+      IPC::Channel::MODE_CLIENT, &delegate);
 
   bootstrap->Connect();
 
   run_loop.Run();
 
   return delegate.passed() ? 0 : 1;
 }
 
 }  // namespace