Rename MojoURLResolver to URLResolver

shell/android/mojo_main.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 "shell/android/mojo_main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 67 matching lines @@
   // Android handler is bundled with the Mojo shell, because it uses the
   // MojoShell application as the JNI bridge to bootstrap execution of other
   // Android Mojo apps that need JNI.
   context->application_manager()->SetLoaderForURL(
       make_scoped_ptr(new BackgroundApplicationLoader(
           make_scoped_ptr(new AndroidHandlerLoader()), "android_handler",
           base::MessageLoop::TYPE_DEFAULT)),
       GURL("mojo:android_handler"));
 
   // By default, the keyboard is handled by the native_viewport_service.
-  context->mojo_url_resolver()->AddCustomMapping(
+  context->url_resolver()->AddURLMapping(
       GURL("mojo:keyboard"), GURL("mojo:native_viewport_service"));
 }
 
 void QuitShellThread() {
   g_shell_thread.Get()->Join();
   g_shell_thread.Pointer()->reset();
   Java_MojoMain_finishActivity(base::android::AttachCurrentThread(),
                                g_main_activiy.Get().obj());
   exit(0);
 }
@@ skipping 95 matching lines @@
   base::CommandLine::ForCurrentProcess()->AppendArg(
       base::android::ConvertJavaStringToUTF8(env, jurl));
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell
 }  // namespace mojo