Add creation of ServiceManager to Content (2nd try)

mojo/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 "mojo/shell/android/mojo_main.h"
 
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 28 matching lines @@
   NativeViewportServiceLoader() {}
   virtual ~NativeViewportServiceLoader() {}
 
  private:
   virtual void LoadService(ServiceManager* manager,
                            const GURL& url,
                            ScopedShellHandle service_handle) OVERRIDE {
     app_.reset(CreateNativeViewportService(g_context.Get().get(),
                                            service_handle.Pass()));
   }
+
+  virtual void OnServiceError(ServiceManager* manager,
+                              const GURL& url) OVERRIDE {
+  }
+
   scoped_ptr<Application> app_;
 };
 
 LazyInstance<scoped_ptr<NativeViewportServiceLoader> >
     g_viewport_service_loader = LAZY_INSTANCE_INITIALIZER;
 
 }  // namspace
 
 static void Init(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
@@ skipping 41 matching lines @@
 
   g_context.Get().reset(shell_context);
   shell::Run(shell_context);
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace mojo