Make PlatformViewport and NativeViewportImpl use Shell* instead of ApplicationImpl*.

services/native_viewport/native_viewport_impl.h

Index: services/native_viewport/native_viewport_impl.h
diff --git a/services/native_viewport/native_viewport_impl.h b/services/native_viewport/native_viewport_impl.h
index bad5f2a3b43402a9d9ab6eda674ffdffa0848fd3..d1652dbfeef85f185cc70a422b92147264558c54 100644
--- a/services/native_viewport/native_viewport_impl.h
+++ b/services/native_viewport/native_viewport_impl.h
@@ -21,7 +21,7 @@ class GpuState;
 }
 
 namespace mojo {
-class ApplicationImpl;
+class Shell;
 }
 
 namespace ui {
@@ -37,7 +37,9 @@ namespace native_viewport {
 class NativeViewportImpl : public mojo::NativeViewport,
                            public PlatformViewport::Delegate {
  public:
-  NativeViewportImpl(mojo::ApplicationImpl* application,
+  // TODO(vtl): Maybe this should take an
+  // |InterfaceHandle<ApplicationConnector>| instead of a |Shell*|.
+  NativeViewportImpl(mojo::Shell* shell,
                      bool is_headless,
                      const scoped_refptr<gles2::GpuState>& gpu_state,
                      mojo::InterfaceRequest<mojo::NativeViewport> request);
@@ -71,8 +73,8 @@ class NativeViewportImpl : public mojo::NativeViewport,
   // with.
   void AckEvent(int32 pointer_id);
 
-  mojo::ApplicationImpl* application_;
-  bool is_headless_;
+  mojo::Shell* const shell_;
+  const bool is_headless_;
   scoped_ptr<PlatformViewport> platform_viewport_;
   OnscreenContextProvider context_provider_;
   bool sent_metrics_;