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

mojo/services/native_viewport/native_viewport_android.cc

Index: mojo/services/native_viewport/native_viewport_android.cc
diff --git a/mojo/services/native_viewport/native_viewport_android.cc b/mojo/services/native_viewport/native_viewport_android.cc
index 1763f170ad307617f906427f3cf0f6ec931f0880..121289c61941fb31fc2dc82295ccef8dd8a7dcfa 100644
--- a/mojo/services/native_viewport/native_viewport_android.cc
+++ b/mojo/services/native_viewport/native_viewport_android.cc
@@ -9,7 +9,7 @@
 
 #include "base/android/jni_android.h"
 #include "jni/NativeViewportAndroid_jni.h"
-#include "mojo/shell/context.h"
+#include "mojo/services/native_viewport/native_viewport_context.h"
 #include "ui/events/event.h"
 #include "ui/gfx/point.h"
 
@@ -38,7 +38,7 @@ bool NativeViewportAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-NativeViewportAndroid::NativeViewportAndroid(shell::Context* context,
+NativeViewportAndroid::NativeViewportAndroid(NativeViewportContext* context,
                                              NativeViewportDelegate* delegate)
     : delegate_(delegate),
       context_(context),
@@ -103,7 +103,7 @@ bool NativeViewportAndroid::TouchEvent(JNIEnv* env, jobject obj,
 
 void NativeViewportAndroid::Init(const gfx::Rect& bounds) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_NativeViewportAndroid_createForActivity(env, context_->activity(),
+  Java_NativeViewportAndroid_createForActivity(env, context_->GetActivity(),

[qsr, 2014/07/21 08:20:25]

Any reason not to use base::android::GetApplicationContext() from
base/android/jni_android.h

 That remove the context alltogether.

                                                reinterpret_cast<jlong>(this));
 }
 
@@ -151,7 +151,7 @@ void NativeViewportAndroid::ReleaseWindow() {
 
 // static
 scoped_ptr<NativeViewport> NativeViewport::Create(
-    shell::Context* context,
+    NativeViewportContext* context,
     NativeViewportDelegate* delegate) {
   return scoped_ptr<NativeViewport>(
       new NativeViewportAndroid(context, delegate)).Pass();