Eliminate mojo::Shell client lib class

chrome/app/mash/mash_runner.cc

 // Copyright 2016 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/app/mash/mash_runner.h"
 
 #include "ash/mus/sysui_application.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
 #include "components/mus/mus_app.h"
 #include "components/resource_provider/resource_provider_app.h"
 #include "content/public/common/content_switches.h"
 #include "mash/quick_launch/quick_launch_application.h"
 #include "mash/shell/shell_application_delegate.h"
 #include "mash/wm/window_manager_application.h"
 #include "mojo/common/mojo_scheme_register.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/shell/background/background_shell.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner_delegate.h"
+#include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "mojo/shell/runner/common/switches.h"
 #include "mojo/shell/runner/host/child_process_base.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 #if defined(OS_LINUX)
 #include "components/font_service/font_service_app.h"
@@ skipping 146 matching lines @@
   mojo::shell::BackgroundShell background_shell;
   scoped_ptr<mojo::shell::BackgroundShell::InitParams> init_params(
       new mojo::shell::BackgroundShell::InitParams);
   init_params->native_runner_delegate = &native_runner_delegate;
   background_shell.Init(std::move(init_params));
   shell_client_.reset(new DefaultShellClient);
   shell_connection_.reset(new mojo::ShellConnection(
       shell_client_.get(),
       background_shell.CreateShellClientRequest(GURL("exe:chrome_mash"))));
   shell_connection_->WaitForInitialize();
-  static_cast<mojo::Shell*>(shell_connection_.get())
-      ->Connect("mojo:mash_shell");
+  shell_connection_->connector()->Connect("mojo:mash_shell");
   base::MessageLoop::current()->Run();
 }
 
 void MashRunner::RunChild() {
   base::i18n::InitializeICU();
   mojo::shell::ChildProcessMain(
       base::Bind(&MashRunner::StartChildApp, base::Unretained(this)));
 }
 
 void MashRunner::StartChildApp(
@@ skipping 25 matching lines @@
   scoped_ptr<base::MessageLoop> message_loop;
 #if defined(OS_LINUX)
   base::AtExitManager exit_manager;
 #endif
   if (!IsChild())
     message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
   MashRunner mash_runner;
   mash_runner.Run();
   return 0;
 }