Fix chrome --mash

mojo/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 "mojo/shell/shell.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 511 matching lines @@
   DCHECK(it != shell_client_factories_.end());
   shell_client_factories_.erase(it);
 }
 
 void Shell::OnGotResolvedName(scoped_ptr<ConnectParams> params,
                               const String& resolved_name,
                               const String& resolved_instance,
                               mojom::CapabilityFilterPtr base_filter,
                               const String& file_url) {
   std::string instance_name = params->target().instance();
-  if (instance_name == GetNamePath(params->target().name()))
+  if (instance_name == GetNamePath(params->target().name()) &&
+      resolved_instance != GetNamePath(resolved_name)) {
     instance_name = resolved_instance;
+  }
   Identity target(params->target().name(), params->target().user_id(),
                   instance_name);
   params->set_target(target);
 
   // It's possible that when this manifest request was issued, another one was
   // already in-progress and completed by the time this one did, and so the
   // requested application may already be running.
   if (ConnectToExistingInstance(&params))
     return;
 
@@ skipping 11 matching lines @@
   if (LoadWithLoader(target, &request))
     return;
 
   CHECK(!file_url.is_null() && !base_filter.is_null());
 
   if (target.name() != resolved_name) {
     // In cases where a package alias is resolved, we have to use the instance
     // from the original request rather than for the package itself, which will
     // always be the same.
     CreateShellClient(
-        source, Identity(resolved_name, target.user_id(), resolved_instance),
+        source, Identity(resolved_name, target.user_id(), instance_name),
         target.name(), std::move(request));
   } else {
     bool start_sandboxed = false;
     native_runners_.push_back(
         instance->StartWithFileURL(file_url.To<GURL>(), std::move(request),
                                    start_sandboxed,
                                    native_runner_factory_.get()));
   }
 }
 
@@ skipping 17 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