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

mojo/examples/sample_app/sample_app.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 <stdio.h>
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/examples/sample_app/gles2_client_impl.h"
@@ skipping 14 matching lines @@
                   public mojo::NativeViewportClient {
  public:
   SampleApp() : weak_factory_(this) {}
 
   virtual ~SampleApp() {
     // TODO(darin): Fix shutdown so we don't need to leak this.
     mojo_ignore_result(gles2_client_.release());
   }
 
   virtual void Initialize(mojo::ApplicationImpl* app) override {
-    app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_);
+    app->ConnectToService("mojo:native_viewport_service", &viewport_);
     viewport_.set_client(this);
 
-    // TODO(jamesr): Should be mojo:mojo_gpu_service
-    app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_);
+    // TODO(jamesr): Should be mojo:gpu_service
+    app->ConnectToService("mojo:native_viewport_service", &gpu_service_);
 
     mojo::SizePtr size(mojo::Size::New());
     size->width = 800;
     size->height = 600;
     viewport_->Create(size.Pass(),
                       base::Bind(&SampleApp::OnCreatedNativeViewport,
                                  weak_factory_.GetWeakPtr()));
     viewport_->Show();
   }
 
@@ skipping 32 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SampleApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new examples::SampleApp);
   return runner.Run(shell_handle);
 }