Change ServiceManager::SetLoaderForUrl() to SetLoaderForScheme()

mojo/shell/android/mojo_main.cc

Index: mojo/shell/android/mojo_main.cc
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc
index a6eb580f0b97e12601e8986891f105d2654b8889..803b7fb094224a592ad71fe5ecac1b84e7b1a5d3 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/mojo/shell/android/mojo_main.cc
@@ -34,6 +34,8 @@ LazyInstance<scoped_ptr<base::MessageLoop> > g_java_message_loop =
 LazyInstance<scoped_ptr<shell::Context> > g_context =
     LAZY_INSTANCE_INITIALIZER;
 
+const char kNativeViewportServiceUrl[] = "mojo:mojo_native_viewport_service";
+
 class NativeViewportServiceLoader : public ServiceLoader {
  public:
   NativeViewportServiceLoader() {}
@@ -43,6 +45,7 @@ class NativeViewportServiceLoader : public ServiceLoader {
   virtual void LoadService(ServiceManager* manager,
                            const GURL& url,
                            ScopedShellHandle service_handle) OVERRIDE {
+    DCHECK_EQ(url.spec(), kNativeViewportServiceUrl);
     app_.reset(CreateNativeViewportService(g_context.Get().get(),
                                            service_handle.Pass()));
   }
@@ -99,9 +102,9 @@ static void Start(JNIEnv* env, jclass clazz, jobject context, jstring jurl) {
   shell::Context* shell_context = new shell::Context();
   shell_context->set_activity(activity.obj());
   g_viewport_service_loader.Get().reset(new NativeViewportServiceLoader());
-  shell_context->service_manager()->SetLoaderForURL(
+  shell_context->service_manager()->SetLoaderForScheme(
       g_viewport_service_loader.Get().get(),
-      GURL("mojo:mojo_native_viewport_service"));
+      "mojo");
 
   g_context.Get().reset(shell_context);
   shell::Run(shell_context);