Make ServiceManager own its ServiceLoaders

R=viettrungluu@chromium.org, viettrungluu
BUG=

Review URL: https://codereview.chromium.org/242203009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265020 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 14 deletions

diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc
index a912864..88ce11e 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/mojo/shell/android/mojo_main.cc
@@ -54,9 +54,6 @@ class NativeViewportServiceLoader : public ServiceLoader {
   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) {
@@ -98,9 +95,8 @@ 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(
-      g_viewport_service_loader.Get().get(),
+      make_scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader),
       GURL("mojo:mojo_native_viewport_service"));
 
   g_context.Get().reset(shell_context);
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 2ba4aef..df86d14 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -59,12 +59,12 @@ Context::Context()
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
-  dynamic_service_loader_.reset(
-      new DynamicServiceLoader(this, runner_factory.Pass()));
-  service_manager_.set_default_loader(dynamic_service_loader_.get());
-  native_viewport_service_loader_.reset(new NativeViewportServiceLoader(this));
-  service_manager_.SetLoaderForURL(native_viewport_service_loader_.get(),
-                                    GURL("mojo:mojo_native_viewport_service"));
+  service_manager_.set_default_loader(
+      scoped_ptr<ServiceLoader>(
+          new DynamicServiceLoader(this, runner_factory.Pass())));
+  service_manager_.SetLoaderForURL(
+      scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)),
+      GURL("mojo:mojo_native_viewport_service"));
 
   if (cmdline->HasSwitch(switches::kSpy)) {
     spy_.reset(new mojo::Spy(&service_manager_,
@@ -73,7 +73,7 @@ Context::Context()
 }
 
 Context::~Context() {
-  service_manager_.set_default_loader(NULL);
+  service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
 }
 
 }  // namespace shell
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index 57ed5d5..c9acdc4 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -46,9 +46,7 @@ class Context {
   Storage storage_;
   Loader loader_;
   ServiceManager service_manager_;
-  scoped_ptr<DynamicServiceLoader> dynamic_service_loader_;
   scoped_ptr<Spy> spy_;
-  scoped_ptr<NativeViewportServiceLoader> native_viewport_service_loader_;
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> activity_;
 #endif  // defined(OS_ANDROID)