Eliminate mojo::Shell client lib class

content/common/mojo/mojo_shell_connection_impl.cc

 // Copyright 2015 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/mojo/mojo_shell_connection_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 53 matching lines @@
 
 void MojoShellConnectionImpl::WaitForShell(
     mojo::ScopedMessagePipeHandle handle) {
   mojo::shell::mojom::ShellClientRequest request;
   runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner(
       &request, std::move(handle)));
   shell_connection_.reset(new mojo::ShellConnection(this, std::move(request)));
   shell_connection_->WaitForInitialize();
 }
 
-void MojoShellConnectionImpl::Initialize(mojo::Shell* shell,
+void MojoShellConnectionImpl::Initialize(mojo::Connector* connector,
                                          const std::string& url,
                                          uint32_t id,
                                          uint32_t user_id) {
   initialized_ = true;
 }
 
 bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) {
   bool found = false;
   for (auto listener : listeners_)
     found |= listener->AcceptConnection(connection);
   return found;
 }
 
-mojo::Shell* MojoShellConnectionImpl::GetShell() {
+mojo::Connector* MojoShellConnectionImpl::GetConnector() {
   DCHECK(initialized_);
-  return shell_connection_.get();
+  return shell_connection_->connector();
 }
 
 bool MojoShellConnectionImpl::UsingExternalShell() const {
   return true;
 }
 
 void MojoShellConnectionImpl::AddListener(Listener* listener) {
   DCHECK(std::find(listeners_.begin(), listeners_.end(), listener) ==
          listeners_.end());
   listeners_.push_back(listener);
@@ skipping 13 matching lines @@
 // static
 void MojoShellConnection::Destroy() {
   // This joins the shell controller thread.
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 }  // namespace content