mojo_shell crashes on Linux

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 1b366abd96d6d3826e87b3409fa76c86d5ff600b..4178fba4f919ddff5cfcfefff5041efecf202040 100644
--- a/mojo/services/native_viewport/native_viewport_android.h
+++ b/mojo/services/native_viewport/native_viewport_android.h
@@ -22,7 +22,8 @@ namespace services {
 
 class NativeViewportAndroid : public NativeViewport {
  public:
-  explicit NativeViewportAndroid(NativeViewportDelegate* delegate);
+  explicit NativeViewportAndroid(shell::Context* context,
+                                 NativeViewportDelegate* delegate);
   virtual ~NativeViewportAndroid();
 
   base::WeakPtr<NativeViewportAndroid> GetWeakPtr() {
@@ -38,11 +39,13 @@ class NativeViewportAndroid : public NativeViewport {
  private:
   // Overridden from NativeViewport:
   virtual gfx::Size GetSize() OVERRIDE;
+  virtual void Init() OVERRIDE;
   virtual void Close() OVERRIDE;
 
   void ReleaseWindow();
 
   NativeViewportDelegate* delegate_;
+  shell::Context* context_;
   ANativeWindow* window_;
   gfx::Size size_;
   ui::SequentialIDGenerator id_generator_;