Add a instance groups to Connect(), and introduce an Identity struct.

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 124 matching lines @@
     base::Process process = base::Process::Open(instances_[row]->pid);
     process.Terminate(9, true);
   }
 
   // Overridden from mojo::shell::mojom::InstanceListener:
   void SetExistingInstances(mojo::Array<InstanceInfoPtr> instances) override {
     // This callback should only be called with an empty model.
     DCHECK(instances_.empty());
     mojo::Array<mojo::String> names;
     for (size_t i = 0; i < instances.size(); ++i) {
-      InsertInstance(instances[i]->id, instances[i]->name, instances[i]->pid);
-      names.push_back(instances[i]->name);
+      InsertInstance(instances[i]->id, instances[i]->identity->name,
+                     instances[i]->pid);
+      names.push_back(instances[i]->identity->name);
     }
     catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
   void InstanceCreated(InstanceInfoPtr instance) override {
     DCHECK(!ContainsId(instance->id));
-    InsertInstance(instance->id, instance->name, instance->pid);
+    InsertInstance(instance->id, instance->identity->name, instance->pid);
     observer_->OnItemsAdded(static_cast<int>(instances_.size()), 1);
     mojo::Array<mojo::String> names;
-    names.push_back(instance->name);
+    names.push_back(instance->identity->name);
     catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
   void InstanceDestroyed(uint32_t id) override {
     for (auto it = instances_.begin(); it != instances_.end(); ++it) {
       if ((*it)->id == id) {
         observer_->OnItemsRemoved(
             static_cast<int>(it - instances_.begin()), 1);
         instances_.erase(it);
@@ skipping 84 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TaskViewerContents);
 };
 
 }  // namespace
 
 TaskViewer::TaskViewer() {}
 TaskViewer::~TaskViewer() {}
 
 void TaskViewer::Initialize(mojo::Connector* connector,
-                            const std::string& url,
-                            const std::string& user_id,
+                            const mojo::Identity& identity,
                             uint32_t id) {
-  tracing_.Initialize(connector, url);
+  tracing_.Initialize(connector, identity.name());
 
   aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
   views::WindowManagerConnection::Create(connector);
 
   mojo::shell::mojom::ShellPtr shell;
   connector->ConnectToInterface("mojo:shell", &shell);
 
   mojo::shell::mojom::InstanceListenerPtr listener;
   mojo::shell::mojom::InstanceListenerRequest request = GetProxy(&listener);
   shell->AddInstanceListener(std::move(listener));
 
   package_manager::mojom::CatalogPtr catalog;
   connector->ConnectToInterface("mojo:package_manager", &catalog);
 
   TaskViewerContents* task_viewer = new TaskViewerContents(
       std::move(request), std::move(catalog));
   views::Widget* window = views::Widget::CreateWindowWithBounds(
       task_viewer, gfx::Rect(10, 10, 500, 500));
   window->Show();
 }
 
 }  // namespace task_viewer
 }  // namespace main