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 54 matching lines @@
 
 class Context::NativeViewportServiceLoader : public ServiceLoader {
  public:
   explicit NativeViewportServiceLoader(Context* context) : context_(context) {}
   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(
+        context_, shell_handle.Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
   Context* context_;
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader);
 };
@@ skipping 70 matching lines @@
   // that there aren't shutdown ordering issues. Once native viewport service is
   // moved into its own process this can likely be nuked.
 #if defined(USE_AURA)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(),
       GURL("mojo:mojo_view_manager"));
 #endif
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
 }
 
+#if defined(OS_ANDROID)
+jobject Context::GetActivity() { return activity_.obj(); }
+#endif  // defined(OS_ANDROID)
+
 }  // namespace shell
 }  // namespace mojo