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

mojo/shell/mojo_url_resolver.cc

Index: mojo/shell/mojo_url_resolver.cc
diff --git a/mojo/shell/mojo_url_resolver.cc b/mojo/shell/mojo_url_resolver.cc
index 75c625ca6c3fb44105f812f34f0d48d807f3dc24..b7bc8433a856043a0ba657c94591e0d86e6a2f5a 100644
--- a/mojo/shell/mojo_url_resolver.cc
+++ b/mojo/shell/mojo_url_resolver.cc
@@ -8,6 +8,7 @@
 #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"
 
@@ -15,7 +16,14 @@ 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)