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

mojo/services/native_viewport/native_viewport_android.h

Index: mojo/services/native_viewport/native_viewport_android.h
diff --git a/mojo/services/native_viewport/native_viewport_android.h b/mojo/services/native_viewport/native_viewport_android.h
index c24e38e7858a0d54e4f7d6d8280ed2ff6706666d..48f0680732b7fe909b1047dcfe78abafe2c9fb9b 100644
--- a/mojo/services/native_viewport/native_viewport_android.h
+++ b/mojo/services/native_viewport/native_viewport_android.h
@@ -29,7 +29,7 @@ class MOJO_NATIVE_VIEWPORT_EXPORT NativeViewportAndroid
  public:
   static MOJO_NATIVE_VIEWPORT_EXPORT bool Register(JNIEnv* env);
 
-  explicit NativeViewportAndroid(shell::Context* context,
+  explicit NativeViewportAndroid(NativeViewportContext* context,
                                  NativeViewportDelegate* delegate);
   virtual ~NativeViewportAndroid();
 
@@ -54,7 +54,7 @@ class MOJO_NATIVE_VIEWPORT_EXPORT NativeViewportAndroid
   void ReleaseWindow();
 
   NativeViewportDelegate* delegate_;
-  shell::Context* context_;
+  NativeViewportContext* context_;
   ANativeWindow* window_;
   gfx::Rect bounds_;
   ui::SequentialIDGenerator id_generator_;