Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

chrome/browser/task_manager/providers/child_process_task.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/task_manager/providers/child_process_task.h"
 
 #include <utility>
 
 #include "base/i18n/rtl.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/process_resource_usage.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_manager/task_manager_observer.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_thread.h"
 #include "content/public/browser/child_process_data.h"
-#include "content/public/common/child_process_host.h"
 #include "content/public/common/process_type.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension_set.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"
 
 namespace task_manager {
 
@@ skipping 73 matching lines @@
     case content::PROCESS_TYPE_SANDBOX_HELPER:
     case content::PROCESS_TYPE_MAX:
       break;
     case content::PROCESS_TYPE_UNKNOWN:
       NOTREACHED() << "Need localized name for child process type.";
   }
 
   return result_title;
 }
 
-// Connects the |resource_reporter| to the InterfaceRegistry of the
+// Connects the |resource_reporter| to the ServiceRegistry of the
 // BrowserChildProcessHost whose unique ID is |unique_child_process_id|.
 void ConnectResourceReporterOnIOThread(
     int unique_child_process_id,
-    mojom::ResourceUsageReporterRequest resource_reporter) {
+    mojo::InterfaceRequest<mojom::ResourceUsageReporter> resource_reporter) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   content::BrowserChildProcessHost* host =
       content::BrowserChildProcessHost::FromID(unique_child_process_id);
   if (!host)
     return;
 
-  shell::InterfaceProvider* interfaces = host->GetHost()->GetRemoteInterfaces();
+  shell::InterfaceProvider* interfaces = host->GetRemoteInterfaces();
   if (interfaces)
     interfaces->GetInterface(std::move(resource_reporter));
 }
 
 // Creates the Mojo service wrapper that will be used to sample the V8 memory
 // usage of the browser child process whose unique ID is
 // |unique_child_process_id|.
 ProcessResourceUsage* CreateProcessResourcesSampler(
     int unique_child_process_id) {
-  mojom::ResourceUsageReporterPtr usage_reporter;
-  mojom::ResourceUsageReporterRequest request = mojo::GetProxy(&usage_reporter);
+  mojom::ResourceUsageReporterPtr service;
+  mojo::InterfaceRequest<mojom::ResourceUsageReporter> usage_reporter =
+      mojo::GetProxy(&service);
+
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ConnectResourceReporterOnIOThread,
-                 unique_child_process_id, base::Passed(&request)));
+                 unique_child_process_id,
+                 base::Passed(&usage_reporter)));
 
-  return new ProcessResourceUsage(std::move(usage_reporter));
+  return new ProcessResourceUsage(std::move(service));
 }
 
 bool UsesV8Memory(int process_type) {
   switch (process_type) {
     case content::PROCESS_TYPE_UTILITY:
     case content::PROCESS_TYPE_BROWSER:
     case content::PROCESS_TYPE_RENDERER:
       return true;
 
     default:
@@ skipping 73 matching lines @@
 
 int64_t ChildProcessTask::GetV8MemoryAllocated() const {
   return v8_memory_allocated_;
 }
 
 int64_t ChildProcessTask::GetV8MemoryUsed() const {
   return v8_memory_used_;
 }
 
 }  // namespace task_manager