Eliminate MojoApplicationHost

chrome/browser/task_manager/child_process_resource_provider.cc

 // Copyright 2013 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/task_manager/child_process_resource_provider.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/process_resource_usage.h"
 #include "chrome/browser/task_manager/resource_provider.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/nacl/common/nacl_process_type.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
-#include "content/public/common/service_registry.h"
 #include "grit/theme_resources.h"
+#include "services/shell/public/cpp/interface_provider.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 using content::BrowserChildProcessHostIterator;
 using content::BrowserThread;
 using content::WebContents;
 
 namespace task_manager {
 
@@ skipping 50 matching lines @@
 
 gfx::ImageSkia* ChildProcessResource::default_icon_ = NULL;
 
 // static
 void ChildProcessResource::ConnectResourceReporterOnIOThread(
     int id,
     mojo::InterfaceRequest<mojom::ResourceUsageReporter> req) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   content::BrowserChildProcessHost* host =
       content::BrowserChildProcessHost::FromID(id);
-  if (!host)
-    return;
-
-  content::ServiceRegistry* registry = host->GetServiceRegistry();
-  if (!registry)
-    return;
-
-  registry->ConnectToRemoteService(std::move(req));
+  if (host)
+    host->GetRemoteInterfaces()->GetInterface(std::move(req));
 }
 
 ChildProcessResource::ChildProcessResource(int process_type,
                                            const base::string16& name,
                                            base::ProcessHandle handle,
                                            int unique_process_id)
     : process_type_(process_type),
       name_(name),
       handle_(handle),
       unique_process_id_(unique_process_id),
@@ skipping 273 matching lines @@
 // This is called on the UI thread.
 void ChildProcessResourceProvider::ChildProcessDataRetreived(
     const std::vector<content::ChildProcessData>& child_processes) {
   for (size_t i = 0; i < child_processes.size(); ++i)
     AddToTaskManager(child_processes[i]);
 
   task_manager_->model()->NotifyDataReady();
 }
 
 }  // namespace task_manager