Change mojo URLs from mojo://mojo_foo to mojo://foo.

mojo/shell/mojo_url_resolver.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/mojo_url_resolver.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/strings/string_util.h"
 #include "net/base/filename_util.h"
 #include "url/url_util.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
-std::string MakeSharedLibraryName(const std::string& host_name) {
+std::string MakeSharedLibraryName(std::string host_name) {
+  // TODO(aa): This should go away soon. In the Chromium repo, all the app
+  // target names start with "mojo_" by convention. But when we have an SDK,
+  // one would assume the libraries would have names that don't have this bit.
+  std::string prefix = "mojo_";
+  if (!StartsWithASCII(host_name, prefix, true))
+    host_name = prefix + host_name;

[abarth-chromium, 2014/10/20 16:34:15]

This broke Sky because the sky targets are prefixed with sky_ rather than
mojo_...  I've renamed them to have a mojo_ prefix for now.  Is that the right
fix?

+
 #if defined(OS_WIN)
   return host_name + ".dll";
 #elif defined(OS_LINUX) || defined(OS_ANDROID)
   return "lib" + host_name + ".so";
 #elif defined(OS_MACOSX)
   return host_name + ".so";
 #else
   NOTREACHED() << "dynamic loading of services not supported";
   return std::string();
 #endif
@@ skipping 65 matching lines @@
     std::map<GURL, GURL>::const_iterator it = url_map_.find(mapped_url);
     if (it == url_map_.end())
       break;
     mapped_url = it->second;
   }
   return mapped_url;
 }
 
 }  // namespace shell
 }  // namespace mojo