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

services/native_viewport/platform_viewport_android.cc

 // Copyright 2013 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.
 
 #include "services/native_viewport/platform_viewport_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "jni/PlatformViewportAndroid_jni.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "services/native_viewport/native_viewport_support.mojom.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 #include "ui/gfx/point.h"
 
 namespace native_viewport {
 namespace {
 
 mojo::EventType MotionEventActionToEventType(jint action) {
@@ skipping 22 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewportAndroid, public:
 
 // static
 bool PlatformViewportAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-PlatformViewportAndroid::PlatformViewportAndroid(
-    mojo::ApplicationImpl* application,
-    Delegate* delegate)
-    : application_(application),
+PlatformViewportAndroid::PlatformViewportAndroid(mojo::Shell* shell,
+                                                 Delegate* delegate)
+    : shell_(shell),
       delegate_(delegate),
       window_(NULL),
       id_generator_(0),
       weak_factory_(this) {}
 
 PlatformViewportAndroid::~PlatformViewportAndroid() {
   if (window_)
     ReleaseWindow();
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!java_platform_viewport_android_.is_empty()) {
@@ skipping 88 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewportAndroid, PlatformViewport implementation:
 
 void PlatformViewportAndroid::Init(const gfx::Rect& bounds) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_PlatformViewportAndroid_createRequest(env,
                                              reinterpret_cast<intptr_t>(this));
 
-  mojo::ConnectToService(application_->shell(), "mojo:native_viewport_support",
+  mojo::ConnectToService(shell_, "mojo:native_viewport_support",
                          GetProxy(&support_service_));
   support_service_->CreateNewNativeWindow(
       base::Bind(&PlatformViewportAndroid::Close, weak_factory_.GetWeakPtr()));
 }
 
 void PlatformViewportAndroid::Show() {
   // Nothing to do. View is created visible.
 }
 
 void PlatformViewportAndroid::Hide() {
@@ skipping 20 matching lines @@
 
 void PlatformViewportAndroid::ReleaseWindow() {
   ANativeWindow_release(window_);
   window_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewport, public:
 
 // static
-scoped_ptr<PlatformViewport> PlatformViewport::Create(
-    mojo::ApplicationImpl* application_,
-    Delegate* delegate) {
+scoped_ptr<PlatformViewport> PlatformViewport::Create(mojo::Shell* shell,
+                                                      Delegate* delegate) {
   return scoped_ptr<PlatformViewport>(
-             new PlatformViewportAndroid(application_, delegate))
+             new PlatformViewportAndroid(shell, delegate))
       .Pass();
 }
 
 }  // namespace native_viewport