Add a ServiceRegistry::ConnectToRemoteService that takes an InterfaceRequest<>.

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 <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 42 matching lines @@
   size_t GetV8MemoryUsed() const override;
 
   // Returns the pid of the child process.
   int process_id() const { return pid_; }
 
  private:
   // Returns a localized title for the child process.  For example, a plugin
   // process would be "Plugin: Flash" when name is "Flash".
   base::string16 GetLocalizedTitle() const;
 
-  static mojo::InterfacePtrInfo<ResourceUsageReporter>
-  GetProcessUsageOnIOThread(int id);
-
-  void OnGetProcessUsageDone(
-      mojo::InterfacePtrInfo<ResourceUsageReporter> info);
+  static void ConnectResourceReporterOnIOThread(
+      int id, mojo::InterfaceRequest<ResourceUsageReporter> req);
 
   int process_type_;
   base::string16 name_;
   base::ProcessHandle handle_;
   int pid_;
   int unique_process_id_;
   mutable base::string16 title_;
   bool network_usage_support_;
   scoped_ptr<ProcessResourceUsage> resource_usage_;
 
   // The icon painted for the child processs.
   // TODO(jcampan): we should have plugin specific icons for well-known
   // plugins.
   static gfx::ImageSkia* default_icon_;
 
   base::WeakPtrFactory<ChildProcessResource> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessResource);
 };
 
 gfx::ImageSkia* ChildProcessResource::default_icon_ = NULL;
 
 // static
-mojo::InterfacePtrInfo<ResourceUsageReporter>
-ChildProcessResource::GetProcessUsageOnIOThread(int id) {
+void ChildProcessResource::ConnectResourceReporterOnIOThread(
+    int id, mojo::InterfaceRequest<ResourceUsageReporter> req) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   content::BrowserChildProcessHost* host =
       content::BrowserChildProcessHost::FromID(id);
   if (!host)
-    return mojo::InterfacePtrInfo<ResourceUsageReporter>();
+    return;
 
   content::ServiceRegistry* registry = host->GetServiceRegistry();
   if (!registry)
-    return mojo::InterfacePtrInfo<ResourceUsageReporter>();
+    return;
 
-  ResourceUsageReporterPtr service;
-  registry->ConnectToRemoteService(&service);
-  return service.PassInterface().Pass();
+  registry->ConnectToRemoteService(req.Pass());
 }
 
 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),
       network_usage_support_(false),
       weak_factory_(this) {
   // We cache the process id because it's not cheap to calculate, and it won't
   // be available when we get the plugin disconnected notification.
   pid_ = base::GetProcId(handle);
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetImageSkiaNamed(IDR_PLUGINS_FAVICON);
     // TODO(jabdelmalek): use different icon for web workers.
   }
-  BrowserThread::PostTaskAndReplyWithResult(
+  ResourceUsageReporterPtr service;
+  mojo::InterfaceRequest<ResourceUsageReporter> request =
+      mojo::GetProxy(&service);
+  BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(&ChildProcessResource::GetProcessUsageOnIOThread,
-                 unique_process_id),
-      base::Bind(&ChildProcessResource::OnGetProcessUsageDone,
-                 weak_factory_.GetWeakPtr()));
+      base::Bind(&ChildProcessResource::ConnectResourceReporterOnIOThread,
+                 unique_process_id, base::Passed(&request)));
+  resource_usage_.reset(new ProcessResourceUsage(service.Pass()));
 }
 
 ChildProcessResource::~ChildProcessResource() {
 }
 
-void ChildProcessResource::OnGetProcessUsageDone(
-    mojo::InterfacePtrInfo<ResourceUsageReporter> info) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (info.is_valid()) {
-    ResourceUsageReporterPtr service;
-    service.Bind(info.Pass());
-    resource_usage_.reset(new ProcessResourceUsage(service.Pass()));
-  }
-}
-
 // Resource methods:
 base::string16 ChildProcessResource::GetTitle() const {
   if (title_.empty())
     title_ = GetLocalizedTitle();
 
   return title_;
 }
 
 base::string16 ChildProcessResource::GetProfileName() const {
   return base::string16();
@@ skipping 244 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