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

services/native_viewport/native_viewport_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_NATIVE_VIEWPORT_NATIVE_VIEWPORT_IMPL_H_
 #define SERVICES_NATIVE_VIEWPORT_NATIVE_VIEWPORT_IMPL_H_
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/gpu/interfaces/gpu.mojom.h"
 #include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
 #include "services/native_viewport/onscreen_context_provider.h"
 #include "services/native_viewport/platform_viewport.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace gles2 {
 class GpuState;
 }
 
 namespace mojo {
-class ApplicationImpl;
+class Shell;
 }
 
 namespace ui {
 class Event;
 }
 
 namespace native_viewport {
 
 // A NativeViewportImpl is bound to a message pipe and to a PlatformViewport.
 // The NativeViewportImpl's lifetime ends when either the message pipe is closed
 // or the PlatformViewport informs the NativeViewportImpl that it has been
 // destroyed.
 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);
   ~NativeViewportImpl() override;
 
   // NativeViewport implementation.
   void Create(mojo::SizePtr size,
               mojo::SurfaceConfigurationPtr requested_configuration,
               const CreateCallback& callback) override;
   void RequestMetrics(const RequestMetricsCallback& callback) override;
@@ skipping 13 matching lines @@
   void OnAcceleratedWidgetDestroyed() override;
   bool OnEvent(mojo::EventPtr event) override;
   void OnDestroyed() override;
 
  private:
   // Callback when the dispatcher has processed a message we're waiting on
   // an ack from. |pointer_id| identifies the pointer the message was associated
   // 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_;
   mojo::ViewportMetricsPtr metrics_;
   CreateCallback create_callback_;
   RequestMetricsCallback metrics_callback_;
   mojo::NativeViewportEventDispatcherPtr event_dispatcher_;
   mojo::StrongBinding<mojo::NativeViewport> binding_;
 
   // Set of pointer_ids we've sent a move to and are waiting on an ack.
   std::set<int32> pointers_waiting_on_ack_;
 
   base::WeakPtrFactory<NativeViewportImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportImpl);
 };
 
 }  // namespace native_viewport
 
 #endif  // SERVICES_NATIVE_VIEWPORT_NATIVE_VIEWPORT_IMPL_H_