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

mojo/services/network/network_service_delegate.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 "mojo/services/network/network_service_delegate.h"
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 30 matching lines @@
     NetworkServiceDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void NetworkServiceDelegate::RemoveObserver(
     NetworkServiceDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void NetworkServiceDelegate::Initialize(Connector* connector,
-                                        const std::string& name,
-                                        const std::string& user_id,
+                                        const Identity& identity,
                                         uint32_t id) {
   // TODO(erg): Find everything else that writes to the filesystem and
   // transition it to proxying mojo:filesystem. We shouldn't have any path
   // calculation code here, but sadly need it until the transition is done. In
   // the mean time, manually handle the user-data-dir switch (which gets set in
   // tests) so that tests are writing to a temp dir.
   base::FilePath base_path;
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(kUserDataDir)) {
     base_path = command_line->GetSwitchValuePath(kUserDataDir);
   } else {
     CHECK(PathService::Get(base::DIR_TEMP, &base_path));
     base_path = base_path.Append(FILE_PATH_LITERAL("network_service"));
   }
 
   context_.reset(new NetworkContext(base_path, this));
-  tracing_.Initialize(connector, name);
+  tracing_.Initialize(connector, identity.name());
 }
 
 bool NetworkServiceDelegate::AcceptConnection(Connection* connection) {
   DCHECK(context_);
   connection->AddInterface<CookieStore>(this);
   connection->AddInterface<NetworkService>(this);
   connection->AddInterface<URLLoaderFactory>(this);
   connection->AddInterface<WebSocketFactory>(this);
   return true;
 }
@@ skipping 26 matching lines @@
 }
 
 void NetworkServiceDelegate::Quit() {
   // Destroy the NetworkContext now as it requires MessageLoop::current() upon
   // destruction and it is the last moment we know for sure that it is
   // running.
   context_.reset();
 }
 
 }  // namespace mojo