Use ShellClientFactory interface to load mojo:profile

services/shell/shell.cc

 // Copyright 2014 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 "services/shell/shell.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 624 matching lines @@
 void Shell::AddInstanceListener(mojom::InstanceListenerPtr listener) {
   // TODO(beng): filter instances provided by those visible to this client.
   Array<mojom::InstanceInfoPtr> instances;
   for (auto& instance : identity_to_instance_)
     instances.push_back(instance.second->CreateInstanceInfo());
   listener->SetExistingInstances(std::move(instances));
 
   instance_listeners_.AddPtr(std::move(listener));
 }
 
-void Shell::CreateShellClientWithFactory(const Identity& source,
-                                         const Identity& shell_client_factory,
+void Shell::CreateShellClientWithFactory(const Identity& shell_client_factory,
                                          const std::string& name,
                                          mojom::ShellClientRequest request) {
   mojom::ShellClientFactory* factory =
-      GetShellClientFactory(shell_client_factory, source);
+      GetShellClientFactory(shell_client_factory);
   factory->CreateShellClient(std::move(request), name);
 }
 
 mojom::ShellClientFactory* Shell::GetShellClientFactory(
-    const Identity& shell_client_factory_identity,
-    const Identity& source_identity) {
+    const Identity& shell_client_factory_identity) {
   auto it = shell_client_factories_.find(shell_client_factory_identity);
   if (it != shell_client_factories_.end())
     return it->second.get();
 
+  Identity source_identity(kShellName, mojom::kInheritUserID);
   mojom::ShellClientFactoryPtr factory;
   ConnectToInterface(this, source_identity, shell_client_factory_identity,
                      &factory);
   mojom::ShellClientFactory* factory_interface = factory.get();
   factory.set_connection_error_handler(
       base::Bind(&Shell::OnShellClientFactoryLost,
                  weak_ptr_factory_.GetWeakPtr(),
                  shell_client_factory_identity));
   shell_client_factories_[shell_client_factory_identity] = std::move(factory);
   return factory_interface;
@@ skipping 67 matching lines @@
     mojom::ShellClientRequest request = GetProxy(&client);
     if (LoadWithLoader(target, &request)) {
       instance->StartWithClient(std::move(client));
     } else {
       CHECK(!result->package_url.is_null() && !result->capabilities.is_null());
 
       if (target.name() != result->resolved_name) {
         instance->StartWithClient(std::move(client));
         Identity factory(result->resolved_name, target.user_id(),
                          instance_name);
-        CreateShellClientWithFactory(source, factory, target.name(),
+        CreateShellClientWithFactory(factory, target.name(),
                                      std::move(request));
       } else {
         instance->StartWithFilePath(
             util::UrlToFilePath(result->package_url.To<GURL>()));
       }
     }
   }
 
   // Now that the instance has a ShellClient, we can connect to it.
   instance->ConnectToClient(std::move(params));
@@ skipping 23 matching lines @@
   for (auto it = native_runners_.begin(); it != native_runners_.end(); ++it) {
     if (it->get() == runner) {
       native_runners_.erase(it);
       return;
     }
   }
 }
 
 }  // namespace shell
 }  // namespace mojo