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

mojo/services/native_viewport/native_viewport_impl.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/services/native_viewport/native_viewport_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 17 matching lines @@
          event->type() == ui::ET_TOUCH_MOVED;
 }
 
 }  // namespace
 
 NativeViewportImpl::NativeViewportImpl(ApplicationImpl* app, bool is_headless)
     : is_headless_(is_headless),
       widget_id_(0u),
       waiting_for_event_ack_(false),
       weak_factory_(this) {
-  app->ConnectToService("mojo:mojo_surfaces_service", &surfaces_service_);
+  app->ConnectToService("mojo:surfaces_service", &surfaces_service_);
   // TODO(jamesr): Should be mojo_gpu_service
-  app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_);
+  app->ConnectToService("mojo:native_viewport_service", &gpu_service_);
 }
 
 NativeViewportImpl::~NativeViewportImpl() {
   // Destroy the NativeViewport early on as it may call us back during
   // destruction and we want to be in a known state.
   platform_viewport_.reset();
 }
 
 void NativeViewportImpl::Create(SizePtr size,
                                 const Callback<void(uint64_t)>& callback) {
@@ skipping 100 matching lines @@
 }
 
 void NativeViewportImpl::ProcessOnBoundsChanged() {
   client()->OnSizeChanged(Size::From(size_));
   if (viewport_surface_)
     viewport_surface_->SetSize(size_);
 }
 
 }  // namespace mojo