Eliminate MojoApplicationHost

content/public/browser/utility_process_mojo_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_UTILITY_PROCESS_MOJO_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_UTILITY_PROCESS_MOJO_CLIENT_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_checker.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "services/shell/public/cpp/interface_provider.h"
 
 namespace content {
 
 // Implements a client to a Mojo service running on a utility process. Takes
 // care of starting the utility process and connecting to the remote Mojo
 // service. The utility process is terminated in the destructor.
 // Note: This class is not thread-safe. It is bound to the
 // SingleThreadTaskRunner it is created on.
 template <class MojoInterface>
 class UtilityProcessMojoClient {
@@ skipping 70 matching lines @@
     // Starts the utility process and connects to the remote Mojo service.
     void StartOnIOThread(const std::string& mojo_interface_name,
                          mojo::ScopedMessagePipeHandle interface_pipe) {
       DCHECK_CURRENTLY_ON(BrowserThread::IO);
       utility_host_ = UtilityProcessHost::Create(nullptr, nullptr)->AsWeakPtr();
       utility_host_->SetName(process_name_);
       if (disable_sandbox_)
         utility_host_->DisableSandbox();
 
       utility_host_->Start();
-
-      ServiceRegistry* service_registry = utility_host_->GetServiceRegistry();
-      service_registry->ConnectToRemoteService(mojo_interface_name,
-                                               std::move(interface_pipe));
+      utility_host_->GetRemoteInterfaces()->GetInterface(
+          mojo_interface_name, std::move(interface_pipe));
     }
 
     // Properties of the utility process.
     base::string16 process_name_;
     bool disable_sandbox_ = false;
 
     // Must only be accessed on the IO thread.
     base::WeakPtr<UtilityProcessHost> utility_host_;
 
     DISALLOW_COPY_AND_ASSIGN(Helper);
@@ skipping 11 matching lines @@
 
   // Checks that this class is always accessed from the same thread.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityProcessMojoClient);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_UTILITY_PROCESS_MOJO_CLIENT_H_