Eliminate MojoApplicationHost

chrome/browser/net/utility_process_mojo_proxy_resolver_factory.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 "chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/grit/generated_resources.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 "services/shell/public/cpp/interface_provider.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 const int kUtilityProcessIdleTimeoutSeconds = 5;
 }
 
 // static
 UtilityProcessMojoProxyResolverFactory*
 UtilityProcessMojoProxyResolverFactory::GetInstance() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ skipping 18 matching lines @@
   DCHECK(!weak_utility_process_host_);
   DVLOG(1) << "Attempting to create utility process for proxy resolver";
   content::UtilityProcessHost* utility_process_host =
       content::UtilityProcessHost::Create(
           scoped_refptr<content::UtilityProcessHostClient>(),
           base::ThreadTaskRunnerHandle::Get());
   utility_process_host->SetName(l10n_util::GetStringUTF16(
       IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME));
   bool process_started = utility_process_host->Start();
   if (process_started) {
-    content::ServiceRegistry* service_registry =
-        utility_process_host->GetServiceRegistry();
-    service_registry->ConnectToRemoteService(
-        mojo::GetProxy(&resolver_factory_));
+    utility_process_host->GetRemoteInterfaces()->GetInterface(
+        &resolver_factory_);
     resolver_factory_.set_connection_error_handler(
         base::Bind(&UtilityProcessMojoProxyResolverFactory::OnConnectionError,
                    base::Unretained(this)));
     weak_utility_process_host_ = utility_process_host->AsWeakPtr();
   } else {
     LOG(ERROR) << "Unable to connect to utility process";
   }
 }
 
 std::unique_ptr<base::ScopedClosureRunner>
@@ skipping 44 matching lines @@
   }
 }
 
 void UtilityProcessMojoProxyResolverFactory::OnIdleTimeout() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(num_proxy_resolvers_, 0u);
   delete weak_utility_process_host_.get();
   weak_utility_process_host_.reset();
   resolver_factory_.reset();
 }