Support reading multiple InterfaceProviderSpecs from manifests

mash/task_viewer/task_viewer.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 "mash/task_viewer/task_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace task_viewer {
 namespace {
 
-using service_manager::mojom::ServiceInfoPtr;
+using service_manager::mojom::RunningServiceInfoPtr;
 
 class TaskViewerContents
     : public views::WidgetDelegateView,
       public ui::TableModel,
       public views::ButtonListener,
       public service_manager::mojom::ServiceManagerListener {
  public:
   TaskViewerContents(
       TaskViewer* task_viewer,
       service_manager::mojom::ServiceManagerListenerRequest request,
@@ skipping 95 matching lines @@
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     DCHECK_EQ(sender, kill_button_);
     DCHECK_EQ(table_view_->SelectedRowCount(), 1);
     int row = table_view_->FirstSelectedRow();
     DCHECK(row < static_cast<int>(instances_.size()));
     base::Process process = base::Process::Open(instances_[row]->pid);
     process.Terminate(9, true);
   }
 
   // Overridden from service_manager::mojom::ServiceManagerListener:
-  void OnInit(std::vector<ServiceInfoPtr> instances) override {
+  void OnInit(std::vector<RunningServiceInfoPtr> instances) override {
     // This callback should only be called with an empty model.
     DCHECK(instances_.empty());
     std::vector<std::string> names;
     names.reserve(instances.size());
     for (size_t i = 0; i < instances.size(); ++i) {
       const service_manager::Identity& identity = instances[i]->identity;
       InsertInstance(identity, instances[i]->pid);
       names.push_back(identity.name());
     }
     catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
-  void OnServiceCreated(ServiceInfoPtr instance) override {
+  void OnServiceCreated(RunningServiceInfoPtr instance) override {
     service_manager::Identity identity = instance->identity;
     DCHECK(!ContainsIdentity(identity));
     InsertInstance(identity, instance->pid);
     observer_->OnItemsAdded(static_cast<int>(instances_.size()), 1);
     std::vector<std::string> names;
     names.push_back(identity.name());
     catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
@@ skipping 148 matching lines @@
   windows_.push_back(window);
 }
 
 void TaskViewer::Create(const service_manager::Identity& remote_identity,
                         mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace task_viewer
 }  // namespace main