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

mojo/shell/context.cc

Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 0eba764383ac43cd1403220fb563d7513fe5ebab..1beaaa3b655024b2049ea7d57aaf9d8fb72a14c9 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -72,7 +72,8 @@ class Context::NativeViewportServiceLoader : public ServiceLoader {
   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,
@@ -163,5 +164,9 @@ Context::~Context() {
   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