Add test for ServiceManager

mojo/shell/context.h

Index: mojo/shell/context.h
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index 375a49b790e355e42a3671d9ee5cd44d7f328753..566440f423d7ffa3e967832ee91684e62095b0c6 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -18,6 +18,8 @@
 namespace mojo {
 namespace shell {
 
+class DynamicServiceLoader;
+
 class Context {
  public:
   Context();
@@ -26,7 +28,7 @@ class Context {
   TaskRunners* task_runners() { return &task_runners_; }
   Storage* storage() { return &storage_; }
   Loader* loader() { return &loader_; }
-  ServiceManager* service_manager() { return service_manager_.get(); }
+  ServiceManager* service_manager() { return &service_manager_; }
 
 #if defined(OS_ANDROID)
   jobject activity() const { return activity_.obj(); }
@@ -37,8 +39,9 @@ class Context {
   TaskRunners task_runners_;
   Storage storage_;
   Loader loader_;
+  ServiceManager service_manager_;
   common::BindingsSupportImpl bindings_support_impl_;
-  scoped_ptr<ServiceManager> service_manager_;
+  scoped_ptr<DynamicServiceLoader> dynamic_service_loader_;
 
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> activity_;