Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

content/common/child_process_host_impl.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 "content/common/child_process_host_impl.h"
 
 #include <limits>
 
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "base/synchronization/lock.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "build/build_config.h"
 #include "content/common/child_process_messages.h"
 #include "content/public/common/child_process_host_delegate.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "ipc/attachment_broker.h"
 #include "ipc/attachment_broker_privileged.h"
-#include "ipc/ipc.mojom.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_mojo.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/message_filter.h"
 #include "mojo/edk/embedder/embedder.h"
-#include "services/shell/public/cpp/interface_provider.h"
 
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
 #elif defined(OS_WIN)
 #include "content/common/font_cache_dispatcher_win.h"
 #endif  // OS_LINUX
 
 namespace {
 
 // Global atomic to generate child process unique IDs.
@@ skipping 75 matching lines @@
   }
 }
 
 void ChildProcessHostImpl::AddFilter(IPC::MessageFilter* filter) {
   filters_.push_back(filter);
 
   if (channel_)
     filter->OnFilterAdded(channel_.get());
 }
 
-shell::InterfaceProvider* ChildProcessHostImpl::GetRemoteInterfaces() {
-  return delegate_->GetRemoteInterfaces();
-}
-
 void ChildProcessHostImpl::ForceShutdown() {
   Send(new ChildProcessMsg_Shutdown());
 }
 
 std::string ChildProcessHostImpl::CreateChannelMojo(
     const std::string& child_token) {
   DCHECK(channel_id_.empty());
   channel_id_ = mojo::edk::GenerateRandomToken();
   mojo::ScopedMessagePipeHandle host_handle =
       mojo::edk::CreateParentMessagePipe(channel_id_, child_token);
   channel_ = IPC::ChannelMojo::Create(std::move(host_handle),
                                       IPC::Channel::MODE_SERVER, this);
   if (!channel_ || !InitChannel())
     return std::string();
 
   return channel_id_;
 }
 
-void ChildProcessHostImpl::CreateChannelMojo() {
-  // TODO(rockot): Remove |channel_id_| once this is the only code path by which
-  // the Channel is created. For now it serves to at least mutually exclude
-  // different CreateChannel* calls.
-  DCHECK(channel_id_.empty());
-  channel_id_ = "ChannelMojo";
-
-  shell::InterfaceProvider* remote_interfaces = GetRemoteInterfaces();
-  DCHECK(remote_interfaces);
-
-  IPC::mojom::ChannelBootstrapPtr bootstrap;
-  remote_interfaces->GetInterface(&bootstrap);
-  channel_ = IPC::ChannelMojo::Create(bootstrap.PassInterface().PassHandle(),
-                                      IPC::Channel::MODE_SERVER, this);
-  DCHECK(channel_);
-
-  bool initialized = InitChannel();
-  DCHECK(initialized);
-}
-
 std::string ChildProcessHostImpl::CreateChannel() {
   DCHECK(channel_id_.empty());
   channel_id_ = IPC::Channel::GenerateVerifiedChannelID(std::string());
   channel_ = IPC::Channel::CreateServer(channel_id_, this);
   if (!channel_ || !InitChannel())
     return std::string();
 
   return channel_id_;
 }
 
@@ skipping 194 matching lines @@
 }
 
 void ChildProcessHostImpl::OnDeletedGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     const gpu::SyncToken& sync_token) {
   // Note: Nothing to do here as ownership of shared memory backed
   // GpuMemoryBuffers is passed with IPC.
 }
 
 }  // namespace content