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

mojo/shell/context.cc

 // Copyright 2013 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/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 28 matching lines @@
 #include "ui/gl/gl_share_group.h"
 #endif  // defined(OS_ANDROID)
 
 namespace mojo {
 namespace shell {
 namespace {
 
 // These mojo: URLs are loaded directly from the local filesystem. They
 // correspond to shared libraries bundled alongside the mojo_shell.
 const char* kLocalMojoURLs[] = {
-  "mojo:mojo_network_service",
+    "mojo:network_service",
 };
 
 // Used to ensure we only init once.
 class Setup {
  public:
   Setup() {
     embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
         new mojo::embedder::SimplePlatformSupport()));
   }
 
   ~Setup() {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
 static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
 
 void InitContentHandlers(DynamicApplicationLoader* loader,
                          base::CommandLine* command_line) {
   // Default content handlers.
-  loader->RegisterContentHandler("image/png", GURL("mojo://mojo_png_viewer/"));
-  loader->RegisterContentHandler("text/html", GURL("mojo://mojo_html_viewer/"));
+  loader->RegisterContentHandler("image/png", GURL("mojo://png_viewer/"));
+  loader->RegisterContentHandler("text/html", GURL("mojo://html_viewer/"));
 
   // Command-line-specified content handlers.
   std::string handlers_spec = command_line->GetSwitchValueASCII(
       switches::kContentHandlers);
   if (handlers_spec.empty())
     return;
 
   std::vector<std::string> parts;
   base::SplitString(handlers_spec, ',', &parts);
   if (parts.size() % 2 != 0) {
@@ skipping 121 matching lines @@
       scoped_ptr<ApplicationLoader>(dynamic_application_loader));
 
   // The native viewport service synchronously waits for certain messages. If we
   // don't run it on its own thread we can easily deadlock. Long term native
   // viewport should run its own process so that this isn't an issue.
 #if defined(OS_ANDROID)
   application_manager_.SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(new UIApplicationLoader(
           scoped_ptr<ApplicationLoader>(new NativeViewportApplicationLoader()),
           this)),
-      GURL("mojo:mojo_native_viewport_service"));
+      GURL("mojo:native_viewport_service"));
 #endif
 
   if (command_line->HasSwitch(switches::kSpy)) {
     spy_.reset(
         new mojo::Spy(&application_manager_,
                       command_line->GetSwitchValueASCII(switches::kSpy)));
     // TODO(cpu): the spy can snoop, but can't tell anybody until
     // the Spy::WebSocketDelegate is implemented. In the original repo this
     // was implemented by src\mojo\spy\websocket_server.h and .cc.
   }
 
 #if defined(OS_ANDROID)
   // On android, the network service is bundled with the shell because the
   // network stack depends on the android runtime.
   {
     scoped_ptr<BackgroundShellApplicationLoader> loader(
         new BackgroundShellApplicationLoader(
             scoped_ptr<ApplicationLoader>(new NetworkApplicationLoader()),
             "network_service",
             base::MessageLoop::TYPE_IO));
     application_manager_.SetLoaderForURL(loader.Pass(),
-                                         GURL("mojo:mojo_network_service"));
+                                         GURL("mojo:network_service"));
   }
 #endif
 
   if (listener_)
     listener_->WaitForListening();
 }
 
 void Context::OnApplicationError(const GURL& gurl) {
   if (app_urls_.find(gurl) != app_urls_.end()) {
     app_urls_.erase(gurl);
@@ skipping 14 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(
       application_url, service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo