Break dependency of native_viewport_service on mojo::shell::Context

mojo/shell/context.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/context.h"
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 47 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
 static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 class Context::NativeViewportServiceLoader : public ServiceLoader {
  public:
-  explicit NativeViewportServiceLoader(Context* context) : context_(context) {}
+  NativeViewportServiceLoader() {}
   virtual ~NativeViewportServiceLoader() {}
 
  private:
   virtual void LoadService(ServiceManager* manager,
                            const GURL& url,
                            ScopedMessagePipeHandle shell_handle) OVERRIDE {
-    app_.reset(::CreateNativeViewportService(context_, shell_handle.Pass()));
+    app_.reset(services::CreateNativeViewportService(shell_handle.Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
-  Context* context_;
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader);
 };
 
 Context::Context()
     : task_runners_(base::MessageLoop::current()->message_loop_proxy()) {
   setup.Get();
 
   for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i)
     mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i]));
 
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   scoped_ptr<DynamicServiceRunnerFactory> runner_factory;
   if (cmdline->HasSwitch(switches::kEnableMultiprocess))
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
   service_manager_.set_default_loader(
       scoped_ptr<ServiceLoader>(
           new DynamicServiceLoader(this, runner_factory.Pass())));
   // The native viewport service synchronously waits for certain messages. If we
   // don't run it on its own thread we can easily deadlock. Long term native
   // viewport should run its own process so that this isn't an issue.
 #if defined(OS_ANDROID)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(
           new UIServiceLoader(
-              scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)),
+              scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader()),
               this)),
       GURL("mojo:mojo_native_viewport_service"));
 #else
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(
           new BackgroundServiceLoader(
-              scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)),
+              scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader()),
               "native_viewport",
               base::MessageLoop::TYPE_UI)),
       GURL("mojo:mojo_native_viewport_service"));
 #endif
 #if defined(USE_AURA)
   // TODO(sky): need a better way to find this. It shouldn't be linked in.
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(new ViewManagerLoader()),
       GURL("mojo:mojo_view_manager"));
 #endif
@@ skipping 29 matching lines @@
 #if defined(USE_AURA)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(),
       GURL("mojo:mojo_view_manager"));
 #endif
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
 }
 
 }  // namespace shell
 }  // namespace mojo