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

mojo/examples/surfaces_app/surfaces_app.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 "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "mojo/application/application_runner_chromium.h"
@@ skipping 18 matching lines @@
 class SurfacesApp : public ApplicationDelegate,
                     public SurfaceClient,
                     public NativeViewportClient {
  public:
   SurfacesApp() : weak_factory_(this) {}
   virtual ~SurfacesApp() {}
 
   // ApplicationDelegate implementation
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) override {
-    connection->ConnectToService("mojo:mojo_native_viewport_service",
-                                 &viewport_);
+    connection->ConnectToService("mojo:native_viewport_service", &viewport_);
     viewport_.set_client(this);
 
-    connection->ConnectToService("mojo:mojo_surfaces_service",
-                                 &surfaces_service_);
+    connection->ConnectToService("mojo:surfaces_service", &surfaces_service_);
     surfaces_service_->CreateSurfaceConnection(base::Bind(
         &SurfacesApp::SurfaceConnectionCreated, base::Unretained(this)));
 
     size_ = gfx::Size(800, 600);
 
     viewport_->Create(Size::From(size_),
                       base::Bind(&SurfacesApp::OnCreatedNativeViewport,
                                  weak_factory_.GetWeakPtr()));
     viewport_->Show();
 
     child_size_ = gfx::Size(size_.width() / 3, size_.height() / 2);
-    connection->ConnectToService("mojo:mojo_surfaces_child_app", &child_one_);
-    connection->ConnectToService("mojo:mojo_surfaces_child_gl_app",
-                                 &child_two_);
+    connection->ConnectToService("mojo:surfaces_child_app", &child_one_);
+    connection->ConnectToService("mojo:surfaces_child_gl_app", &child_two_);
     child_one_->ProduceFrame(Color::From(SK_ColorBLUE),
                              Size::From(child_size_),
                              base::Bind(&SurfacesApp::ChildOneProducedFrame,
                                         base::Unretained(this)));
     child_two_->ProduceFrame(Color::From(SK_ColorGREEN),
                              Size::From(child_size_),
                              base::Bind(&SurfacesApp::ChildTwoProducedFrame,
                                         base::Unretained(this)));
     return true;
   }
@@ skipping 66 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SurfacesApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::SurfacesApp);
   return runner.Run(shell_handle);
 }